July 2010 - Wine-commits - list.winehq.org

Stefan Dösinger : d3d9: Win7+Nvidia returns c2 in COISSUE'd CND.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: e534e2e2ac28bbe23cf43cb21f19dd2655748414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e534e2e2ac28bbe23cf43cb21… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 3 16:17:36 2010 +0200 d3d9: Win7+Nvidia returns c2 in COISSUE'd CND. --- dlls/d3d9/tests/visual.c | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4aaa56c..734bb82 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5138,9 +5138,10 @@ static void cnd_test(IDirect3DDevice9 *device) /* Special fun: The coissue flag on cnd: Apparently cnd always selects the 2nd source, * as if the src0 comparison against 0.5 always evaluates to true. The coissue flag isn't - * set by the compiler, it was added manually after compilation. It isn't always allowed, - * only if there's a mov r0.a, XXXX, and the cnd instruction writes to r0.xyz, otherwise - * native CreatePixelShader returns an error. + * set by the compiler, it was added manually after compilation. Note that the COISSUE + * flag on a color(.xyz) operation is only allowed after an alpha operation. DirectX doesn't + * have proper docs, but GL_ATI_fragment_shader explains the pairing of color and alpha ops + * good enough. * * The shader attempts to test the range [-1;1] against coissued cnd, which is a bit tricky. * The input from t0 is [0;1]. 0.5 is substracted, then we have to multiply with 2. Since @@ -5387,46 +5388,48 @@ static void cnd_test(IDirect3DDevice9 *device) color = getPixelColor(device, 162, 122); ok(color == 0x000000ff, "pixel 162, 122 has color %08x, expected 0x000000ff\n", color); - /* 1.1 shader. coissue flag changed the semantic of cnd, c1 is always selected */ + /* 1.1 shader. coissue flag changed the semantic of cnd, c1 is always selected + * (The Win7 nvidia driver always selects c2) + */ color = getPixelColor(device, 158, 358); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 158, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 162, 358); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 162, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 158, 362); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 158, 362 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 162, 362); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 162, 362 has color %08x, expected 0x0000ff00\n", color); /* 1.2 shader */ color = getPixelColor(device, 478, 358); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 478, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 358); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 482, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 478, 362); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 478, 362 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 362); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 482, 362 has color %08x, expected 0x0000ff00\n", color); /* 1.3 shader */ color = getPixelColor(device, 478, 118); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 478, 118 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 118); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 482, 118 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 478, 122); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 478, 122 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 122); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 482, 122 has color %08x, expected 0x0000ff00\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Stefan Dösinger : d3d9: Use a vertex shader for the nested loop test.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: ba0a5ed104eba6efc54da25a7ae1317c74631402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0a5ed104eba6efc54da25a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 3 18:53:24 2010 +0200 d3d9: Use a vertex shader for the nested loop test. Win7 (or newer Nvidia drivers) don't allow ps_3_0 fragment processing without vertex shaders. This is interesting on its own, but not part of this test. --- dlls/d3d9/tests/visual.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 734bb82..66bf391 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5460,7 +5460,15 @@ static void nested_loop_test(IDirect3DDevice9 *device) { 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff /* end */ }; + const DWORD vshader_code[] = { + 0xfffe0300, /* vs_3_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ + 0x0000ffff /* end */ + }; IDirect3DPixelShader9 *shader; + IDirect3DVertexShader9 *vshader; HRESULT hr; DWORD color; const float quad[] = { @@ -5474,6 +5482,10 @@ static void nested_loop_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed with %08x\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, shader); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed with %08x\n", hr); + hr = IDirect3DDevice9_CreateVertexShader(device, vshader_code, &vshader); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader failed with %08x\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, vshader); + 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, 0x0000ff00, 0.0, 0); @@ -5498,7 +5510,10 @@ static void nested_loop_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_SetPixelShader(device, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed with %08x\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed with %08x\n", hr); IDirect3DPixelShader9_Release(shader); + IDirect3DVertexShader9_Release(vshader); } struct varying_test_struct @@ -11317,20 +11332,16 @@ START_TEST(visual) cnd_test(device_ptr); if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) { dp2add_ps_test(device_ptr); - if (caps.PixelShaderVersion >= D3DPS_VERSION(3, 0)) { + if (caps.PixelShaderVersion >= D3DPS_VERSION(3, 0) && caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { nested_loop_test(device_ptr); fixed_function_varying_test(device_ptr); vFace_register_test(device_ptr); vpos_register_test(device_ptr); multiple_rendertargets_test(device_ptr); - if(caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { - vshader_version_varying_test(device_ptr); - pshader_version_varying_test(device_ptr); - } else { - skip("No vs_3_0 support\n"); - } + vshader_version_varying_test(device_ptr); + pshader_version_varying_test(device_ptr); } else { - skip("No ps_3_0 support\n"); + skip("No ps_3_0 or vs_3_0 support\n"); } } else { skip("No ps_2_0 support\n");

1 0

Stefan Dösinger : d3d9: Use a vertex shader in the vFace test.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: bb3fb05c382dda75522f118de53cb177173f1640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3fb05c382dda75522f118de… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 3 19:02:55 2010 +0200 d3d9: Use a vertex shader in the vFace test. --- dlls/d3d9/tests/visual.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 66bf391..ebb11c6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7992,7 +7992,15 @@ static void vFace_register_test(IDirect3DDevice9 *device) 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff /* END */ }; + const DWORD vshader_code[] = { + 0xfffe0300, /* vs_3_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ + 0x0000ffff /* end */ + }; IDirect3DPixelShader9 *shader; + IDirect3DVertexShader9 *vshader; IDirect3DTexture9 *texture; IDirect3DSurface9 *surface, *backbuffer; const float quad[] = { @@ -8019,6 +8027,8 @@ static void vFace_register_test(IDirect3DDevice9 *device) 1.0, 1.0, 0.1, 1.0, 1.0, }; + hr = IDirect3DDevice9_CreateVertexShader(device, vshader_code, &vshader); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader failed hr=%08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed hr=%08x\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &texture, NULL); @@ -8027,6 +8037,8 @@ static void vFace_register_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed hr=%08x\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, shader); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, vshader); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed hr=%08x\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed hr=%08x\n", hr); hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); @@ -8051,6 +8063,8 @@ static void vFace_register_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%08x\n", hr); /* Blit the texture onto the back buffer to make it visible */ + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); @@ -8082,6 +8096,7 @@ static void vFace_register_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed hr=%08x\n", hr); IDirect3DDevice9_SetTexture(device, 0, NULL); IDirect3DPixelShader9_Release(shader); + IDirect3DVertexShader9_Release(vshader); IDirect3DSurface9_Release(surface); IDirect3DSurface9_Release(backbuffer); IDirect3DTexture9_Release(texture);

1 0

Thomas Mullaly : urlmon: Implemented functionality for retrieving the scheme type of a IUri.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: a34700f0346ddad5f9347d604180769215311c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34700f0346ddad5f9347d604… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jun 7 21:41:19 2010 -0400 urlmon: Implemented functionality for retrieving the scheme type of a IUri. --- dlls/urlmon/tests/uri.c | 24 ++++++++++++------------ dlls/urlmon/uri.c | 22 +++++++++++++++------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 80a2593..d1e5163 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -112,7 +112,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_DNS,S_OK,TRUE}, /* HOST_TYPE */ {80,S_OK,TRUE}, /* PORT */ - {URL_SCHEME_HTTP,S_OK,TRUE}, /* SCHEME */ + {URL_SCHEME_HTTP,S_OK,FALSE}, /* SCHEME */ {URLZONE_INVALID,E_NOTIMPL,FALSE} /* ZONE */ } }, @@ -141,7 +141,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_DNS,S_OK,TRUE}, {80,S_OK,TRUE}, - {URL_SCHEME_HTTP,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -170,7 +170,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_DNS,S_OK,TRUE}, {80,S_OK,TRUE}, - {URL_SCHEME_HTTP,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE}, } }, @@ -199,7 +199,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_DNS,S_OK,TRUE}, {80,S_OK,TRUE}, - {URL_SCHEME_HTTP,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE}, } }, @@ -229,7 +229,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_DNS,S_OK,TRUE}, {9999,S_OK,TRUE}, - {URL_SCHEME_FTP,S_OK,TRUE}, + {URL_SCHEME_FTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -257,7 +257,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_UNKNOWN,S_OK,TRUE}, {0,S_FALSE,TRUE}, - {URL_SCHEME_FILE,S_OK,TRUE}, + {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -285,7 +285,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_UNKNOWN,S_OK,TRUE}, {0,S_FALSE,TRUE}, - {URL_SCHEME_FILE,S_OK,TRUE}, + {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -313,7 +313,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_UNKNOWN,S_OK,TRUE}, {0,S_FALSE,TRUE}, - {URL_SCHEME_UNKNOWN,S_OK,TRUE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -342,7 +342,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_IPV4,S_OK,TRUE}, {80,S_OK,TRUE}, - {URL_SCHEME_HTTP,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -371,7 +371,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_IPV6,S_OK,TRUE}, {80,S_OK,TRUE}, - {URL_SCHEME_HTTP,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -400,7 +400,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_IPV6,S_OK,TRUE}, {21,S_OK,TRUE}, - {URL_SCHEME_FTP,S_OK,TRUE}, + {URL_SCHEME_FTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -429,7 +429,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_IPV6,S_OK,TRUE}, {80,S_OK,TRUE}, - {URL_SCHEME_HTTP,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index f99061f..36ba81c 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -500,6 +500,8 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DWORD *pcchProperty, DWORD dwFlags) { Uri *This = URI_THIS(iface); + HRESULT hres; + TRACE("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); if(!pcchProperty) @@ -520,7 +522,17 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW return E_INVALIDARG; } - return E_NOTIMPL; + switch(uriProp) { + case Uri_PROPERTY_SCHEME: + *pcchProperty = This->scheme_type; + hres = S_OK; + break; + default: + FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + hres = E_NOTIMPL; + } + + return hres; } static HRESULT WINAPI Uri_HasProperty(IUri *iface, Uri_PROPERTY uriProp, BOOL *pfHasProperty) @@ -718,12 +730,8 @@ static HRESULT WINAPI Uri_GetPort(IUri *iface, DWORD *pdwPort) static HRESULT WINAPI Uri_GetScheme(IUri *iface, DWORD *pdwScheme) { Uri *This = URI_THIS(iface); - FIXME("(%p)->(%p)\n", This, pdwScheme); - - if(!pdwScheme) - return E_INVALIDARG; - - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pdwScheme); + return Uri_GetPropertyDWORD(iface, Uri_PROPERTY_SCHEME, pdwScheme, 0); } static HRESULT WINAPI Uri_GetZone(IUri *iface, DWORD *pdwZone)

1 0

Thomas Mullaly : urlmon/tests: Added more test data for scheme parsing and canonicalization.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 84baad06c61b7314aea64c56b7e1909138f93615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84baad06c61b7314aea64c56b… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jun 7 21:43:46 2010 -0400 urlmon/tests: Added more test data for scheme parsing and canonicalization. --- dlls/urlmon/tests/uri.c | 307 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 307 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84baad06c61b7314aea64…

1 0

Alexandre Julliard : d3d9/tests: Avoid sizeof in a trace.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: cbc6ef9e911274db0b5c937661f9b2e8a9852cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc6ef9e911274db0b5c93766… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 11:06:32 2010 +0200 d3d9/tests: Avoid sizeof in a trace. --- dlls/d3d9/tests/d3d9ex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 5af2e4e..f84ad7d 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -302,7 +302,7 @@ static void test_get_adapter_displaymode_ex(void) hr = IDirect3D9_GetAdapterDisplayMode(d3d9, D3DADAPTER_DEFAULT, &mode); ok(SUCCEEDED(hr), "GetAdapterDisplayMode failed, hr %#x.\n", hr); - ok(mode_ex.Size == sizeof(D3DDISPLAYMODEEX), "size is %d instead of %d\n", mode_ex.Size, sizeof(D3DDISPLAYMODEEX)); + ok(mode_ex.Size == sizeof(D3DDISPLAYMODEEX), "size is %d\n", mode_ex.Size); todo_wine ok(mode_ex.Width == mode.Width, "width is %d instead of %d\n", mode_ex.Width, mode.Width); todo_wine ok(mode_ex.Height == mode.Height, "height is %d instead of %d\n", mode_ex.Height, mode.Height); todo_wine ok(mode_ex.RefreshRate == mode.RefreshRate, "RefreshRate is %d instead of %d\n", mode_ex.RefreshRate, mode.RefreshRate);

1 0

Alexandre Julliard : sane.ds: Remove unused variables.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 474899dbcd9e4dabafcc46700305935a0a03514e URL: http://source.winehq.org/git/wine.git/?a=commit;h=474899dbcd9e4dabafcc46700… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 11:06:52 2010 +0200 sane.ds: Remove unused variables. --- dlls/sane.ds/options.c | 3 --- dlls/sane.ds/sane_main.c | 3 +-- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c index c78cf8e..67cb1dc 100644 --- a/dlls/sane.ds/options.c +++ b/dlls/sane.ds/options.c @@ -252,15 +252,12 @@ static void convert_double_fix32(double d, TW_FIX32 *fix32) BOOL convert_sane_res_to_twain(double sane_res, SANE_Unit unit, TW_FIX32 *twain_res, TW_UINT16 twtype) { - double d; - if (unit != SANE_UNIT_MM) return FALSE; if (twtype != TWUN_INCHES) return FALSE; - d = (sane_res / 10.0) / 2.54; convert_double_fix32((sane_res / 10.0) / 2.54, twain_res); return TRUE; diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index a873d6c..13422bb 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -92,14 +92,13 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { case DLL_PROCESS_ATTACH: { #ifdef SONAME_LIBSANE - SANE_Status status; SANE_Int version_code; libsane_handle = open_libsane(); if (! libsane_handle) return FALSE; - status = psane_init (&version_code, NULL); + psane_init (&version_code, NULL); #endif SANE_instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL);

1 0

Alexandre Julliard : gphoto2.ds: Remove unused variables.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: c64a0fd9890ef12ff0cc9abb17bdb07605da41dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64a0fd9890ef12ff0cc9abb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 11:09:12 2010 +0200 gphoto2.ds: Remove unused variables. --- dlls/gphoto2.ds/ds_image.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index ec29eff..f26b3dd 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -384,7 +384,7 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin, pTW_UINT32 pHandle = (pTW_UINT32) pData; HBITMAP hDIB; BITMAPINFO bmpInfo; - LPBYTE bits, oldbits; + LPBYTE bits; JSAMPROW samprow, oldsamprow; HDC dc; @@ -438,7 +438,6 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin, return TWRC_FAILURE; } samprow = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,activeDS.jd.output_width*activeDS.jd.output_components); - oldbits = bits; oldsamprow = samprow; while ( activeDS.jd.output_scanline<activeDS.jd.output_height ) { int i, x = pjpeg_read_scanlines(&activeDS.jd,&samprow,1); @@ -455,7 +454,6 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin, bits = (LPBYTE)(((UINT_PTR)bits + 3) & ~3); samprow = oldsamprow; } - bits = oldbits; HeapFree (GetProcessHeap(), 0, samprow); gp_file_unref (activeDS.file); activeDS.file = NULL; @@ -575,7 +573,7 @@ _get_gphoto2_file_as_DIB( struct jpeg_error_mgr jerr; HDC dc; BITMAPINFO bmpInfo; - LPBYTE bits, oldbits; + LPBYTE bits; JSAMPROW samprow, oldsamprow; if(!libjpeg_handle) { @@ -648,7 +646,6 @@ _get_gphoto2_file_as_DIB( return TWRC_FAILURE; } samprow = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,jd.output_width*jd.output_components); - oldbits = bits; oldsamprow = samprow; while ( jd.output_scanline<jd.output_height ) { int i, x = pjpeg_read_scanlines(&jd,&samprow,1);

1 0

Alexandre Julliard : msvcrt/tests: Fix printf format warnings with ptrdiff_t.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: a38ff8d7dd9741d3346a7982483375dee5748d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38ff8d7dd9741d3346a79824… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 11:09:15 2010 +0200 msvcrt/tests: Fix printf format warnings with ptrdiff_t. --- dlls/msvcrt/tests/string.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b70d777..55cb5e4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1102,23 +1102,23 @@ static void test__strtod(void) d = strtod(double1, &end); ok(almost_equal(d, 12.1), "d = %lf\n", d); - ok(end == double1+4, "incorrect end (%d)\n", end-double1); + ok(end == double1+4, "incorrect end (%d)\n", (int)(end-double1)); d = strtod(double2, &end); ok(almost_equal(d, -13.721), "d = %lf\n", d); - ok(end == double2+7, "incorrect end (%d)\n", end-double2); + ok(end == double2+7, "incorrect end (%d)\n", (int)(end-double2)); d = strtod(double3, &end); ok(almost_equal(d, 0), "d = %lf\n", d); - ok(end == double3, "incorrect end (%d)\n", end-double3); + ok(end == double3, "incorrect end (%d)\n", (int)(end-double3)); d = strtod(double4, &end); ok(almost_equal(d, 210000000000.0), "d = %lf\n", d); - ok(end == double4+6, "incorrect end (%d)\n", end-double4); + ok(end == double4+6, "incorrect end (%d)\n", (int)(end-double4)); d = strtod(double5, &end); ok(almost_equal(d, 214.353), "d = %lf\n", d); - ok(end == double5+9, "incorrect end (%d)\n", end-double5); + ok(end == double5+9, "incorrect end (%d)\n", (int)(end-double5)); d = strtod("12.1d2", NULL); ok(almost_equal(d, 12.1e2), "d = %lf\n", d); @@ -1156,7 +1156,7 @@ static void test__strtod(void) errno = 0xdeadbeef; d = strtod(overflow, &end); ok(errno == ERANGE, "errno = %x\n", errno); - ok(end == overflow+21, "incorrect end (%d)\n", end-overflow); + ok(end == overflow+21, "incorrect end (%d)\n", (int)(end-overflow)); errno = 0xdeadbeef; strtod("-1d309", NULL);

1 0

Alexandre Julliard : rundll32: Fix a pointer conversion warning on 64-bit.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 59ef151a93b79be888845eaf3c1ae7d4b04e09e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ef151a93b79be888845eaf3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 11:09:20 2010 +0200 rundll32: Fix a pointer conversion warning on 64-bit. --- programs/rundll32/rundll32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index c619693..53508c9 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -123,7 +123,7 @@ static void *get_entry_point32( HMODULE module, LPCWSTR entry, BOOL *unicode ) /* determine if the entry point is an ordinal */ if (entry[0] == '#') { - int ordinal = atoiW( entry + 1 ); + INT_PTR ordinal = atoiW( entry + 1 ); if (ordinal <= 0) return NULL;

1 0