May 2015 - Wine-commits - list.winehq.org

Matteo Bruni : wined3d: Implement WINED3D_LIGHT_PARALLELPOINT support in the GLSL ffp.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 213f7d9f4580482d8e8194dc27c92f00d454425f URL: http://source.winehq.org/git/wine.git/?a=commit;h=213f7d9f4580482d8e8194dc2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 30 23:22:18 2015 +0200 wined3d: Implement WINED3D_LIGHT_PARALLELPOINT support in the GLSL ffp. --- dlls/ddraw/light.c | 3 --- dlls/wined3d/device.c | 9 ++++++++- dlls/wined3d/glsl_shader.c | 17 +++++++++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index a3660a3..0cc237d 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -175,9 +175,6 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) if ((!data->dltType) || (data->dltType > D3DLIGHT_PARALLELPOINT)) return DDERR_INVALIDPARAMS; - if (data->dltType == D3DLIGHT_PARALLELPOINT) - FIXME("D3DLIGHT_PARALLELPOINT not implemented.\n"); - /* Translate D3DLIGHT2 structure to D3DLIGHT7. */ light7->dltType = data->dltType; light7->dcvDiffuse = data->dcvColor; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1f4216a..6b40c62 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1455,7 +1455,6 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, { case WINED3D_LIGHT_POINT: case WINED3D_LIGHT_SPOT: - case WINED3D_LIGHT_PARALLELPOINT: case WINED3D_LIGHT_GLSPOT: /* Incorrect attenuation values can cause the gl driver to crash. * Happens with Need for speed most wanted. */ @@ -1467,6 +1466,7 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, break; case WINED3D_LIGHT_DIRECTIONAL: + case WINED3D_LIGHT_PARALLELPOINT: /* Ignores attenuation */ break; @@ -1582,6 +1582,13 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, /* FIXME: Range */ break; + case WINED3D_LIGHT_PARALLELPOINT: + object->position.x = light->position.x; + object->position.y = light->position.y; + object->position.z = light->position.z; + object->position.w = 1.0f; + break; + default: FIXME("Unrecognized light type %#x.\n", light->type); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 909b158..b9d95e6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1186,6 +1186,11 @@ static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context *c GL_EXTCALL(glUniform3fv(prog->vs.light_location[light].direction, 1, &vec4.x)); break; + case WINED3D_LIGHT_PARALLELPOINT: + multiply_vector_matrix(&vec4, &light_info->position, view); + GL_EXTCALL(glUniform4fv(prog->vs.light_location[light].position, 1, &vec4.x)); + break; + default: FIXME("Unrecognized light type %#x.\n", light_info->OriginalParms.type); } @@ -5538,6 +5543,18 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer " * ffp_light[%u].specular;\n", i); break; + case WINED3D_LIGHT_PARALLELPOINT: + shader_addline(buffer, "ambient += ffp_light[%u].ambient.xyz;\n", i); + if (!settings->normal) + break; + shader_addline(buffer, "dir = normalize(ffp_light[%u].position.xyz);\n", i); + shader_addline(buffer, "diffuse += clamp(dot(dir, normal), 0.0, 1.0)" + " * ffp_light[%u].diffuse.xyz;\n", i); + shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); + shader_addline(buffer, "if (t > 0.0) specular += pow(t, ffp_material.shininess)" + " * ffp_light[%u].specular;\n", i); + break; + default: if (light_type) FIXME("Unhandled light type %#x.\n", light_type);

1 0

Matteo Bruni : ddraw/tests: Add a ddraw4 specular lighting test.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 27de4f25cf4065422eec4e340fe8b520d561648f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27de4f25cf4065422eec4e340… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 30 23:22:19 2015 +0200 ddraw/tests: Add a ddraw4 specular lighting test. --- dlls/ddraw/tests/ddraw4.c | 283 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27de4f25cf4065422eec4…

1 0

Alexandre Julliard : ws2_32: Avoid UINT32_MAX.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 57e2d9ef753951e3f2e041d61b98e64cc679cf29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e2d9ef753951e3f2e041d61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 15:45:11 2015 +0900 ws2_32: Avoid UINT32_MAX. --- dlls/ws2_32/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 52b5394..ef43186 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -33,6 +33,7 @@ #include <stdio.h> #include <string.h> #include <sys/types.h> +#include <limits.h> #ifdef HAVE_SYS_IPC_H # include <sys/ipc.h> #endif @@ -3633,7 +3634,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; timeout = get_rcvsnd_timeo(fd, optname == WS_SO_RCVTIMEO); - *(int *)optval = timeout <= UINT32_MAX ? timeout : UINT32_MAX; + *(int *)optval = timeout <= UINT_MAX ? timeout : UINT_MAX; release_sock_fd( s, fd ); return ret;

1 0

Nikolay Sivov : dwrite: Fix typo in SetStrikethrough().
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 1d815a2801f6a5f78ccb772138e19f1f5fcbae6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d815a2801f6a5f78ccb77213… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 11:33:24 2015 +0300 dwrite: Fix typo in SetStrikethrough(). --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 22fbbd3..5935918 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1533,7 +1533,7 @@ static HRESULT WINAPI dwritetextlayout_SetStrikethrough(IDWriteTextLayout2 *ifac TRACE("(%p)->(%d %s)\n", This, strikethrough, debugstr_range(&range)); value.range = range; - value.u.underline = strikethrough; + value.u.strikethrough = strikethrough; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_STRIKETHROUGH, &value); }

1 0

Nikolay Sivov : dwrite: Improve run tracing format.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 4fa8d3a444aee257733fb119d9e1c805562afd46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fa8d3a444aee257733fb119d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 11:35:13 2015 +0300 dwrite: Improve run tracing format. --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 5935918..68e582e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -249,7 +249,7 @@ static inline struct dwrite_typography *impl_from_IDWriteTypography(IDWriteTypog static inline const char *debugstr_run(const struct regular_layout_run *run) { - return wine_dbg_sprintf("[%u,%u]", run->descr.textPosition, run->descr.textPosition + + return wine_dbg_sprintf("[%u,%u)", run->descr.textPosition, run->descr.textPosition + run->descr.stringLength); }

1 0

Nikolay Sivov : ole32/tests: Fix test failures on some VMs with limited user permissions.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 3d33d8a9c4c63ff06dc4decf89249dcf4d9b3509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d33d8a9c4c63ff06dc4decf8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 11:52:43 2015 +0300 ole32/tests: Fix test failures on some VMs with limited user permissions. --- dlls/ole32/tests/compobj.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 4be9c8b..38d82a8 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1964,7 +1964,12 @@ static void test_TreatAsClass(void) ok(lr == ERROR_SUCCESS, "Couldn't open CLSID key\n"); lr = RegCreateKeyExA(clsidkey, deadbeefA, 0, NULL, 0, KEY_WRITE, NULL, &deadbeefkey, NULL); - ok(lr == ERROR_SUCCESS, "Couldn't create class key\n"); + if (lr) { + win_skip("CoGetTreatAsClass() tests will be skipped (failed to create a test key, error %d)\n", + GetLastError()); + RegCloseKey(clsidkey); + return; + } hr = pCoTreatAsClass(&deadbeef, &deadbeef); ok(hr == REGDB_E_WRITEREGDB, "CoTreatAsClass gave wrong error: %08x\n", hr);

1 0

Nikolay Sivov : setupapi/tests: Trace error codes when SetupOpenLog fails.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 21b9c5f023e0a6db7911ae0162964c37c32f5c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b9c5f023e0a6db7911ae016… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 11:59:24 2015 +0300 setupapi/tests: Trace error codes when SetupOpenLog fails. --- dlls/setupapi/tests/misc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 7423738..d5cfa01 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -787,8 +787,9 @@ static void test_SetupLogError(void) ok(!ret, "SetupLogError succeeded\n"); ok(error == ERROR_FILE_INVALID, "got wrong error: %d\n", error); + SetLastError(0xdeadbeef); ret = SetupOpenLog(FALSE); - ok(ret, "SetupOpenLog failed\n"); + ok(ret, "SetupOpenLog failed, error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupLogErrorA("Test with wrong log severity\r\n", LogSevMaximum); @@ -803,8 +804,9 @@ static void test_SetupLogError(void) ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_PARAMETER /* Win Vista+ */), "SetupLogError failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); ret = SetupOpenLog(FALSE); - ok(ret, "SetupOpenLog failed\n"); + ok(ret, "SetupOpenLog failed, error %d\n", GetLastError()); SetupCloseLog(); }

1 0

Nikolay Sivov : ole32/tests: Fix a test failure on Win8.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: bb37d7507415cb88551c4eb3fa1f9366093ebb88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb37d7507415cb88551c4eb3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 12:13:09 2015 +0300 ole32/tests: Fix a test failure on Win8. --- dlls/ole32/tests/compobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 38d82a8..220052d 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1554,7 +1554,7 @@ static void test_registered_object_thread_affinity(void) ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); GetExitCodeThread(thread, &exitcode); hr = exitcode; - ok(hr == RPC_E_WRONG_THREAD, "CoRevokeClassObject called from different " + ok(hr == RPC_E_WRONG_THREAD || broken(hr == S_OK) /* win8 */, "CoRevokeClassObject called from different " "thread to where registered should return RPC_E_WRONG_THREAD instead of 0x%08x\n", hr); thread = CreateThread(NULL, 0, register_class_object_thread, NULL, 0, &tid);

1 0