October 2011 - Wine-commits

Michael Mc Donnell : d3dx9/tests: Implemented CloneMesh test.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: da6363e377f8a727bdd7bdb42116c533a3a20bd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da6363e377f8a727bdd7bdb42… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Aug 17 12:51:03 2011 +0200 d3dx9/tests: Implemented CloneMesh test. --- dlls/d3dx9_36/tests/mesh.c | 1682 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 1678 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da6363e377f8a727bdd7b…

1 0

Henri Verbeet : wined3d: Get rid of the device parameter to context_setup_target().
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 89d0d3ffd8dc0e1bb8eddb69281269a04d120c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d0d3ffd8dc0e1bb8eddb692… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 25 21:20:28 2011 +0200 wined3d: Get rid of the device parameter to context_setup_target(). --- dlls/wined3d/context.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1def817..f11b8db 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2402,8 +2402,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de return TRUE; } -static void context_setup_target(struct wined3d_device *device, - struct wined3d_context *context, struct wined3d_surface *target) +static void context_setup_target(struct wined3d_context *context, struct wined3d_surface *target) { BOOL old_render_offscreen = context->render_offscreen, render_offscreen; @@ -2507,7 +2506,7 @@ struct wined3d_context *context_acquire(struct wined3d_device *device, struct wi } context_update_window(context); - context_setup_target(device, context, target); + context_setup_target(context, target); context_enter(context); if (!context->valid) return context;

1 0

Henri Verbeet : wined3d: Move the ARB shader program constant handling to the backend where it belongs .
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 7aac0159a995e35c96d30ffed19630c0320bfc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aac0159a995e35c96d30ffed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 25 21:20:29 2011 +0200 wined3d: Move the ARB shader program constant handling to the backend where it belongs. --- dlls/wined3d/arb_program_shader.c | 106 ++++++++++++++++++++++++++++--------- dlls/wined3d/context.c | 38 +------------- dlls/wined3d/device.c | 2 - dlls/wined3d/glsl_shader.c | 8 +-- dlls/wined3d/shader.c | 4 +- dlls/wined3d/wined3d_private.h | 8 +-- 6 files changed, 89 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7aac0159a995e35c96d30…

1 0

Alex Henrie : kernel32: Output message to stderr in current Unix codepage.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 3aff781f63fd7d61e6f42898dc88ef1eaaed9527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aff781f63fd7d61e6f42898d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 25 16:16:21 2011 -0600 kernel32: Output message to stderr in current Unix codepage. Fixes a bug in which the command "wine /." outputs a garbled error message in languages other than English. Supersedes "kernel32: Output message to stderr in UTF-8" --- dlls/kernel32/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6d42696..b6c0b9d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1252,7 +1252,7 @@ void CDECL __wine_kernel_init(void) args[0] = (DWORD_PTR)main_exe_name; FormatMessageW( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, NULL, error, 0, msgW, sizeof(msgW)/sizeof(WCHAR), (__ms_va_list *)args ); - WideCharToMultiByte( CP_ACP, 0, msgW, -1, msg, sizeof(msg), NULL, NULL ); + WideCharToMultiByte( CP_UNIXCP, 0, msgW, -1, msg, sizeof(msg), NULL, NULL ); MESSAGE( "wine: %s", msg ); ExitProcess( error ); }

1 0

Matteo Bruni : d3d9: Limit VS/PS reported version.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 6e6a917617ab79a309e123a0207995b574bc59ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6a917617ab79a309e123a02… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:43 2011 +0200 d3d9: Limit VS/PS reported version. --- dlls/d3d9/directx.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 148b9b7..4099a99 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -381,6 +381,11 @@ void filter_caps(D3DCAPS9* pCaps) pCaps->MaxVertexShaderConst = min(D3D9_MAX_VERTEX_SHADER_CONSTANTF, pCaps->MaxVertexShaderConst); pCaps->NumSimultaneousRTs = min(D3D9_MAX_SIMULTANEOUS_RENDERTARGETS, pCaps->NumSimultaneousRTs); + + if (pCaps->PixelShaderVersion > D3DPS_VERSION(3,0)) + pCaps->PixelShaderVersion = D3DPS_VERSION(3,0); + if (pCaps->VertexShaderVersion > D3DVS_VERSION(3,0)) + pCaps->VertexShaderVersion = D3DVS_VERSION(3,0); } static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(IDirect3D9Ex *iface, UINT Adapter,

1 0

Matteo Bruni : wined3d: Return only the shader major version.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 7254f5e661598a148dd61d008338fd69c49a7ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7254f5e661598a148dd61d008… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:44 2011 +0200 wined3d: Return only the shader major version. --- dlls/d3d8/directx.c | 10 ++++++---- dlls/d3d9/directx.c | 18 +++++++++++++++--- dlls/wined3d/arb_program_shader.c | 12 ++++++------ dlls/wined3d/directx.c | 14 +++++++------- dlls/wined3d/glsl_shader.c | 16 ++++++++-------- 5 files changed, 42 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7254f5e661598a148dd61…

1 0

Matteo Bruni : wined3d: Enable SM4 support in the GLSL shader backend when possible.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 5f2c6b3c8289bb71ad3baf62c66b56b776adb671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2c6b3c8289bb71ad3baf62c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:45 2011 +0200 wined3d: Enable SM4 support in the GLSL shader backend when possible. --- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/glsl_shader.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5d6eef9..f6228eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4750,7 +4750,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte * are the same among all shader models. So to avoid code duplication set the shader version * specific, but otherwise constant caps here */ - if (caps->VertexShaderVersion == 3) + if (caps->VertexShaderVersion >= 3) { /* Where possible set the caps based on OpenGL extensions and if they * aren't set (in case of software rendering) use the VS 3.0 from @@ -4787,7 +4787,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxVertexShader30InstructionSlots = 0; } - if (caps->PixelShaderVersion == 3) + if (caps->PixelShaderVersion >= 3) { /* Where possible set the caps based on OpenGL extensions and if they * aren't set (in case of software rendering) use the PS 3.0 from diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3092ce3..2c7cfe9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4913,9 +4913,15 @@ static void shader_glsl_context_destroyed(void *shader_priv, const struct wined3 static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) { + if (gl_info->supported[EXT_GPU_SHADER4] && gl_info->supported[ARB_GEOMETRY_SHADER4] + && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50)) + { + caps->VertexShaderVersion = 4; + caps->PixelShaderVersion = 4; + } /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 * texldd and texldl instructions. */ - if (gl_info->supported[ARB_SHADER_TEXTURE_LOD] || gl_info->supported[EXT_GPU_SHADER4]) + else if (gl_info->supported[ARB_SHADER_TEXTURE_LOD] || gl_info->supported[EXT_GPU_SHADER4]) { caps->VertexShaderVersion = 3; caps->PixelShaderVersion = 3;

1 0

Matteo Bruni : dxgi: Refuse to create a D3D10 wined3d device if it is not supported by the GPU.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 8af1c6ee19200d572f9c0311efb1bc41717ff112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8af1c6ee19200d572f9c0311e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:46 2011 +0200 dxgi: Refuse to create a D3D10 wined3d device if it is not supported by the GPU. --- dlls/dxgi/device.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 9c94434..6b20235 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -353,6 +353,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l struct wined3d *wined3d; void *layer_base; HRESULT hr; + WINED3DCAPS caps; device->IWineDXGIDevice_iface.lpVtbl = &dxgi_device_vtbl; device->refcount = 1; @@ -398,6 +399,16 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l wined3d_device_parent = IWineDXGIDeviceParent_get_wined3d_device_parent(dxgi_device_parent); FIXME("Ignoring adapter type.\n"); + + hr = wined3d_get_device_caps(wined3d, adapter_ordinal, WINED3DDEVTYPE_HAL, &caps); + if (FAILED(hr) || caps.VertexShaderVersion < 4 || caps.PixelShaderVersion < 4) + { + WARN("Direct3D 10 is not supported on this GPU with the current shader backend.\n"); + if (SUCCEEDED(hr)) + hr = E_FAIL; + goto fail; + } + EnterCriticalSection(&dxgi_cs); hr = wined3d_device_create(wined3d, adapter_ordinal, WINED3DDEVTYPE_HAL, NULL, 0, 4, wined3d_device_parent, &device->wined3d_device);

1 0

Matteo Bruni : wined3d: Refuse to create a shader unsupported by the backend.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 095a9a68937a04949a04d707f81fe7b3d75840b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=095a9a68937a04949a04d707f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:47 2011 +0200 wined3d: Refuse to create a shader unsupported by the backend. --- dlls/d3d9/tests/shader.c | 22 ++++++++++++++++++++-- dlls/wined3d/device.c | 2 ++ dlls/wined3d/shader.c | 19 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index f5a2bcb..ab05289 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -233,6 +233,14 @@ static void test_wrong_shader(IDirect3DDevice9 *device_ptr) 0x0000ffff /* END */ }; + const DWORD vs_3_0[] = { + 0xfffe0300, /* vs_3_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ + 0x0000ffff /* end */ + }; + #if 0 float4 main(const float4 color : COLOR) : SV_TARGET { @@ -263,9 +271,10 @@ float4 main(const float4 color : COLOR) : SV_TARGET 0x00000000, 0x00000000, }; - IDirect3DVertexShader9 *vs; - IDirect3DPixelShader9 *ps; + IDirect3DVertexShader9 *vs = NULL; + IDirect3DPixelShader9 *ps = NULL; HRESULT hret; + D3DCAPS9 caps; hret = IDirect3DDevice9_CreateVertexShader(device_ptr, simple_ps, &vs); ok(hret == D3DERR_INVALIDCALL, "CreateVertexShader returned: hret 0x%x, shader_ptr %p.\n", hret, vs); @@ -274,6 +283,15 @@ float4 main(const float4 color : COLOR) : SV_TARGET hret = IDirect3DDevice9_CreatePixelShader(device_ptr, ps_4_0, &ps); ok(hret == D3DERR_INVALIDCALL, "CreatePixelShader returned: hret 0x%x, shader_ptr %p.\n", hret, ps); + + IDirect3DDevice9_GetDeviceCaps(device_ptr, &caps); + if (caps.VertexShaderVersion < D3DVS_VERSION(3, 0)) + { + hret = IDirect3DDevice9_CreateVertexShader(device_ptr, vs_3_0, &vs); + ok(hret == D3DERR_INVALIDCALL, "CreateVertexShader returned: hret 0x%x, shader_ptr %p.\n", hret, vs); + } + else + skip("This GPU supports SM3, skipping unsupported shader test.\n"); } START_TEST(shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5aace82..05a0ad8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5938,6 +5938,8 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, if (device->shader_backend) { device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); + device->vshader_version = shader_caps.VertexShaderVersion; + device->pshader_version = shader_caps.PixelShaderVersion; device->d3d_vshader_constantF = shader_caps.MaxVertexShaderConst; device->d3d_pshader_constantF = shader_caps.MaxPixelShaderConst; device->vs_clipping = shader_caps.VSClipping; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 69bd69d..50ecc2c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1559,6 +1559,7 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_frontend *fe; HRESULT hr; + unsigned int backend_version; TRACE("shader %p, byte_code %p, output_signature %p, float_const_count %u.\n", shader, byte_code, output_signature, float_const_count); @@ -1602,6 +1603,24 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b WARN("Shader version %d not supported by this D3D API version.\n", reg_maps->shader_version.major); return WINED3DERR_INVALIDCALL; } + switch (type) + { + case WINED3D_SHADER_TYPE_VERTEX: + backend_version = shader->device->vshader_version; + break; + case WINED3D_SHADER_TYPE_PIXEL: + backend_version = shader->device->pshader_version; + break; + default: + FIXME("No backend version-checking for this shader type\n"); + backend_version = 0; + } + if (reg_maps->shader_version.major > backend_version) + { + WARN("Shader version %d.%d not supported by your GPU with the current shader backend.\n", + reg_maps->shader_version.major, reg_maps->shader_version.minor); + return WINED3DERR_INVALIDCALL; + } shader->function = HeapAlloc(GetProcessHeap(), 0, shader->functionLength); if (!shader->function) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b86580..9b510c4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1668,6 +1668,7 @@ struct wined3d_device const struct blit_shader *blitter; unsigned int max_ffp_textures; + DWORD vshader_version, pshader_version; DWORD d3d_vshader_constantF, d3d_pshader_constantF; /* Advertised d3d caps, not GL ones */ DWORD vs_clipping;

1 0

Alexandre Julliard : gdi32/tests: Add tests for path open/closed states.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: f44c1e653317ffaed2c752d1345df56153360eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44c1e653317ffaed2c752d13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 15:06:05 2011 +0200 gdi32/tests: Add tests for path open/closed states. --- dlls/gdi32/path.c | 4 +- dlls/gdi32/tests/path.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 235 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 277d167..2fc998e 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2240,7 +2240,7 @@ BOOL nulldrv_FlattenPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); - if (dc->path.state == PATH_Closed) + if (dc->path.state != PATH_Closed) { SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; @@ -2252,7 +2252,7 @@ BOOL nulldrv_WidenPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); - if (dc->path.state == PATH_Open) + if (dc->path.state != PATH_Closed) { SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 18dffa3..8399b19 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -33,6 +33,238 @@ #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +static void test_path_state(void) +{ + BYTE buffer[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bi = (BITMAPINFO *)buffer; + HDC hdc; + HBITMAP orig, dib; + void *bits; + BOOL ret; + + hdc = CreateCompatibleDC( 0 ); + memset( buffer, 0, sizeof(buffer) ); + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biHeight = 256; + bi->bmiHeader.biWidth = 256; + bi->bmiHeader.biBitCount = 32; + bi->bmiHeader.biPlanes = 1; + bi->bmiHeader.biCompression = BI_RGB; + dib = CreateDIBSection( 0, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0 ); + orig = SelectObject( hdc, dib ); + + BeginPath( hdc ); + LineTo( hdc, 100, 100 ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + + /* selecting another bitmap doesn't affect the path */ + SelectObject( hdc, orig ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + + SelectObject( hdc, dib ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + + ret = EndPath( hdc ); + ok( ret, "EndPath failed error %u\n", GetLastError() ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed error %u\n", GetLastError() ); + + SelectObject( hdc, orig ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed error %u\n", GetLastError() ); + + BeginPath( hdc ); + LineTo( hdc, 100, 100 ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + SaveDC( hdc ); + SelectObject( hdc, dib ); + ret = EndPath( hdc ); + ok( ret, "EndPath failed error %u\n", GetLastError() ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed error %u\n", GetLastError() ); + + /* path should be open again after RestoreDC */ + RestoreDC( hdc, -1 ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + ret = EndPath( hdc ); + ok( ret, "EndPath failed error %u\n", GetLastError() ); + + SaveDC( hdc ); + BeginPath( hdc ); + RestoreDC( hdc, -1 ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed error %u\n", GetLastError() ); + + /* test all functions with no path at all */ + AbortPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = FlattenPath( hdc ); + ok( !ret, "FlattenPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = StrokePath( hdc ); + ok( !ret, "StrokePath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = FillPath( hdc ); + ok( !ret, "FillPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = StrokeAndFillPath( hdc ); + ok( !ret, "StrokeAndFillPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SelectClipPath( hdc, RGN_OR ); + ok( !ret, "SelectClipPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = EndPath( hdc ); + ok( !ret, "SelectClipPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = CloseFigure( hdc ); + ok( !ret, "CloseFigure succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + /* test all functions with an open path */ + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = FlattenPath( hdc ); + ok( !ret, "FlattenPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = StrokePath( hdc ); + ok( !ret, "StrokePath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = FillPath( hdc ); + ok( !ret, "FillPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = StrokeAndFillPath( hdc ); + ok( !ret, "StrokeAndFillPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + Rectangle( hdc, 1, 1, 10, 10 ); /* region needs some contents */ + SetLastError( 0xdeadbeef ); + ret = SelectClipPath( hdc, RGN_OR ); + ok( !ret, "SelectClipPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + ret = CloseFigure( hdc ); + ok( ret, "CloseFigure failed\n" ); + + /* test all functions with a closed path */ + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = FlattenPath( hdc ); + ok( ret, "FlattenPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = StrokePath( hdc ); + ok( ret, "StrokePath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = FillPath( hdc ); + ok( ret, "FillPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = StrokeAndFillPath( hdc ); + ok( ret, "StrokeAndFillPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + Rectangle( hdc, 1, 1, 10, 10 ); /* region needs some contents */ + EndPath( hdc ); + ret = SelectClipPath( hdc, RGN_OR ); + ok( ret, "SelectClipPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = CloseFigure( hdc ); + ok( !ret, "CloseFigure succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = EndPath( hdc ); + ok( !ret, "SelectClipPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + DeleteDC( hdc ); + DeleteObject( dib ); +} + static void test_widenpath(void) { HDC hdc = GetDC(0); @@ -504,6 +736,7 @@ static void test_linedda(void) START_TEST(path) { + test_path_state(); test_widenpath(); test_arcto(); test_anglearc();

1 0