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

Matteo Bruni : d3d9/tests: Add a specular lighting test.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 1e494a69c1a368badf03f844d5911b107e79d774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e494a69c1a368badf03f844d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 23 22:41:14 2015 +0200 d3d9/tests: Add a specular lighting test. --- dlls/d3d9/tests/visual.c | 228 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1a040df..08362e1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -537,6 +537,233 @@ done: DestroyWindow(window); } +static void test_specular_lighting(void) +{ + static const unsigned int vertices_side = 5; + static const unsigned int indices_count = (vertices_side - 1) * (vertices_side - 1) * 2 * 3; + static const DWORD fvf = D3DFVF_XYZ | D3DFVF_NORMAL; + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const D3DLIGHT9 directional = + { + D3DLIGHT_DIRECTIONAL, + {0.0f, 0.0f, 0.0f, 0.0f}, + {1.0f, 1.0f, 1.0f, 0.0f}, + {0.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 1.0f}, + }, + point = + { + D3DLIGHT_POINT, + {0.0f, 0.0f, 0.0f, 0.0f}, + {1.0f, 1.0f, 1.0f, 0.0f}, + {0.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + 100.0f, + 0.0f, + 0.0f, 0.0f, 1.0f, + }; + static const struct expected_color + { + unsigned int x, y; + D3DCOLOR color; + } + expected_directional[] = + { + {160, 120, 0x00ffffff}, + {320, 120, 0x00ffffff}, + {480, 120, 0x00ffffff}, + {160, 240, 0x00ffffff}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00ffffff}, + {160, 360, 0x00ffffff}, + {320, 360, 0x00ffffff}, + {480, 360, 0x00ffffff}, + }, + expected_directional_local[] = + { + {160, 120, 0x003c3c3c}, + {320, 120, 0x00717171}, + {480, 120, 0x003c3c3c}, + {160, 240, 0x00717171}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00717171}, + {160, 360, 0x003c3c3c}, + {320, 360, 0x00717171}, + {480, 360, 0x003c3c3c}, + }, + expected_point[] = + { + {160, 120, 0x00282828}, + {320, 120, 0x005a5a5a}, + {480, 120, 0x00282828}, + {160, 240, 0x005a5a5a}, + {320, 240, 0x00ffffff}, + {480, 240, 0x005a5a5a}, + {160, 360, 0x00282828}, + {320, 360, 0x005a5a5a}, + {480, 360, 0x00282828}, + }, + expected_point_local[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00070707}, + {480, 120, 0x00000000}, + {160, 240, 0x00070707}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00070707}, + {160, 360, 0x00000000}, + {320, 360, 0x00070707}, + {480, 360, 0x00000000}, + }; + static const struct + { + const D3DLIGHT9 *light; + BOOL local_viewer; + const struct expected_color *expected; + unsigned int expected_count; + } + tests[] = + { + {&directional, FALSE, expected_directional, + sizeof(expected_directional) / sizeof(expected_directional[0])}, + {&directional, TRUE, expected_directional_local, + sizeof(expected_directional_local) / sizeof(expected_directional_local[0])}, + {&point, FALSE, expected_point, + sizeof(expected_point) / sizeof(expected_point[0])}, + {&point, TRUE, expected_point_local, + sizeof(expected_point_local) / sizeof(expected_point_local[0])}, + }; + IDirect3DDevice9 *device; + D3DMATERIAL9 material; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + unsigned int i, j, x, y; + struct + { + struct vec3 position; + struct vec3 normal; + } *quad; + WORD *indices; + + quad = HeapAlloc(GetProcessHeap(), 0, vertices_side * vertices_side * sizeof(*quad)); + indices = HeapAlloc(GetProcessHeap(), 0, indices_count * sizeof(*indices)); + for (i = 0, y = 0; y < vertices_side; ++y) + { + for (x = 0; x < vertices_side; ++x) + { + quad[i].position.x = x * 2.0f / (vertices_side - 1) - 1.0f; + quad[i].position.y = y * 2.0f / (vertices_side - 1) - 1.0f; + quad[i].position.z = 1.0f; + quad[i].normal.x = 0.0f; + quad[i].normal.y = 0.0f; + quad[i++].normal.z = -1.0f; + } + } + for (i = 0, y = 0; y < (vertices_side - 1); ++y) + { + for (x = 0; x < (vertices_side - 1); ++x) + { + indices[i++] = y * vertices_side + x + 1; + indices[i++] = y * vertices_side + x; + indices[i++] = (y + 1) * vertices_side + x; + indices[i++] = y * vertices_side + x + 1; + indices[i++] = (y + 1) * vertices_side + x; + indices[i++] = (y + 1) * vertices_side + x + 1; + } + } + + 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_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, 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_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable z test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, fvf); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + memset(&material, 0, sizeof(material)); + material.Specular.r = 1.0f; + material.Specular.g = 1.0f; + material.Specular.b = 1.0f; + material.Specular.a = 1.0f; + material.Power = 30.0f; + hr = IDirect3DDevice9_SetMaterial(device, &material); + ok(SUCCEEDED(hr), "Failed to set material, hr %#x.\n", hr); + + hr = IDirect3DDevice9_LightEnable(device, 0, TRUE); + ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SPECULARENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable specular lighting, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + hr = IDirect3DDevice9_SetLight(device, 0, tests[i].light); + ok(SUCCEEDED(hr), "Failed to set light parameters, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LOCALVIEWER, tests[i].local_viewer); + ok(SUCCEEDED(hr), "Failed to set local viewer state, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, vertices_side * vertices_side, indices_count / 3, indices, + D3DFMT_INDEX16, quad, sizeof(quad[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (j = 0; j < tests[i].expected_count; ++j) + { + color = getPixelColor(device, tests[i].expected[j].x, tests[i].expected[j].y); + ok(color_match(color, tests[i].expected[j].color, 1), + "Expected color 0x%08x at location (%u, %u), got 0x%08x, case %u.\n", + tests[i].expected[j].color, tests[i].expected[j].x, + tests[i].expected[j].y, color, i); + } + } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); + HeapFree(GetProcessHeap(), 0, indices); + HeapFree(GetProcessHeap(), 0, quad); +} + static void clear_test(void) { /* Tests the correctness of clearing parameters */ @@ -17994,6 +18221,7 @@ START_TEST(visual) depth_clamp_test(); stretchrect_test(); lighting_test(); + test_specular_lighting(); clear_test(); color_fill_test(); fog_test();

1 0

Matteo Bruni : wined3d: Introduce D3D7+ normal matrix computation.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: b963c73abb0f0ac9e857b3f2ebf229fb6b086107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b963c73abb0f0ac9e857b3f2e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 23 22:41:12 2015 +0200 wined3d: Introduce D3D7+ normal matrix computation. --- dlls/d3d8/tests/visual.c | 18 ++-- dlls/d3d9/tests/visual.c | 18 ++-- dlls/ddraw/ddraw.c | 8 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/main.c | 9 +- dlls/ddraw/tests/ddraw7.c | 14 ++- dlls/wined3d/glsl_shader.c | 220 ++++++++++++++++++++++++++++++++++++++++++++- include/wine/wined3d.h | 1 + 8 files changed, 243 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b963c73abb0f0ac9e857b…

1 0

Erich E. Hoover : krnl386: Invalid console handles should translate into real handles when creating a new process.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: bc68b30d208209d749522eaba79b0e124956bdde URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc68b30d208209d749522eaba… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Sun Mar 15 15:30:51 2015 -0600 krnl386: Invalid console handles should translate into real handles when creating a new process. --- dlls/krnl386.exe16/file.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 1584340..6c3cef3 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -53,21 +53,26 @@ static HANDLE dos_handles[DOS_TABLE_SIZE]; */ static void FILE_InitProcessDosHandles( void ) { + HANDLE hStdInput, hStdOutput, hStdError, hNull; static BOOL init_done /* = FALSE */; HANDLE cp = GetCurrentProcess(); if (init_done) return; init_done = TRUE; - DuplicateHandle(cp, GetStdHandle(STD_INPUT_HANDLE), cp, &dos_handles[0], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_OUTPUT_HANDLE), cp, &dos_handles[1], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[2], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[3], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[4], - 0, TRUE, DUPLICATE_SAME_ACCESS); + hStdInput = GetStdHandle(STD_INPUT_HANDLE); + hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + hStdError = GetStdHandle(STD_ERROR_HANDLE); + hNull = CreateFileA("NUL", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + /* Invalid console handles need to translate to real DOS handles in a new process */ + if (!hStdInput) hStdInput = hNull; + if (!hStdOutput) hStdOutput = hNull; + if (!hStdError) hStdError = hNull; + DuplicateHandle(cp, hStdInput, cp, &dos_handles[0], 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, hStdOutput, cp, &dos_handles[1], 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, hStdError, cp, &dos_handles[2], 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, hStdError, cp, &dos_handles[3], 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, hStdError, cp, &dos_handles[4], 0, TRUE, DUPLICATE_SAME_ACCESS); + CloseHandle(hNull); } /***********************************************************************

1 0

Henri Verbeet : wined3d: Get rid of the tracing code in shader_vaddline().
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: cfd280fd66b3824d6a9cec4c214e91c900d167ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd280fd66b3824d6a9cec4c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:23 2015 +0200 wined3d: Get rid of the tracing code in shader_vaddline(). --- dlls/wined3d/arb_program_shader.c | 6 +++++ dlls/wined3d/glsl_shader.c | 9 +++++++ dlls/wined3d/shader.c | 50 +++++++++++---------------------------- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 29 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 39800f2..7a497d2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3262,6 +3262,12 @@ static BOOL shader_arb_compile(const struct wined3d_gl_info *gl_info, GLenum tar const char *ptr, *line; GLint native, pos; + if (TRACE_ON(d3d_shader)) + { + ptr = src; + while ((line = get_line(&ptr))) TRACE_(d3d_shader)(" %.*s", (int)(ptr - line), line); + } + GL_EXTCALL(glProgramStringARB(target, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(src), src)); checkGLcall("glProgramStringARB()"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f1bf0a3..0f18019 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -344,7 +344,16 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id /* Context activation is done by the caller. */ static void shader_glsl_compile(const struct wined3d_gl_info *gl_info, GLuint shader, const char *src) { + const char *ptr, *line; + TRACE("Compiling shader object %u.\n", shader); + + if (TRACE_ON(d3d_shader)) + { + ptr = src; + while ((line = get_info_log_line(&ptr))) TRACE_(d3d_shader)(" %.*s", (int)(ptr - line), line); + } + GL_EXTCALL(glShaderSource(shader, 1, &src, NULL)); checkGLcall("glShaderSource"); GL_EXTCALL(glCompileShader(shader)); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c249c9a..7d0c47b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -249,8 +249,6 @@ void shader_buffer_clear(struct wined3d_shader_buffer *buffer) { buffer->buffer[0] = '\0'; buffer->content_size = 0; - buffer->lineNo = 0; - buffer->newline = TRUE; } BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) @@ -273,48 +271,28 @@ void shader_buffer_free(struct wined3d_shader_buffer *buffer) int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va_list args) { - char *base = buffer->buffer + buffer->content_size; + unsigned int rem; int rc; char *new_buffer; - while(1) + for (;;) { - rc = vsnprintf(base, buffer->buffer_size - buffer->content_size, format, args); - if (rc < 0 /* C89 */ || (unsigned int)rc >= buffer->buffer_size - buffer->content_size /* C99 */) - { - new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2); - if (!new_buffer) - { - ERR("The buffer allocated for the shader program string is too small at %d bytes.\n", buffer->buffer_size); - buffer->content_size = buffer->buffer_size - 1; - return -1; - } - buffer->buffer = new_buffer; - buffer->buffer_size = buffer->buffer_size * 2; - base = buffer->buffer + buffer->content_size; - } - else - { + rem = buffer->buffer_size - buffer->content_size; + rc = vsnprintf(&buffer->buffer[buffer->content_size], rem, format, args); + + if (rc >= 0 /* C89 */ && (unsigned int)rc < rem /* C99 */) break; - } - } - if (buffer->newline) - { - TRACE("GL HW (%u, %u) : %s", buffer->lineNo + 1, buffer->content_size, base); - buffer->newline = FALSE; - } - else - { - TRACE("%s", base); + if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2))) + { + ERR("Failed to grow buffer.\n"); + buffer->buffer[buffer->content_size] = '\0'; + return -1; + } + buffer->buffer = new_buffer; + buffer->buffer_size = buffer->buffer_size * 2; } - buffer->content_size += rc; - if (buffer->buffer[buffer->content_size-1] == '\n') - { - ++buffer->lineNo; - buffer->newline = TRUE; - } return 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd2a85a..ecbec5b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -440,8 +440,6 @@ struct wined3d_shader_buffer char *buffer; unsigned int buffer_size; unsigned int content_size; - unsigned int lineNo; - BOOL newline; }; enum WINED3D_SHADER_INSTRUCTION_HANDLER

1 0

Stefan Dösinger : wined3d: Introduce resource-type specific format flags.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 3c0ed9ce0af5370f89605d8bc4ceaec578562ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c0ed9ce0af5370f89605d8bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 24 10:33:47 2015 +0200 wined3d: Introduce resource-type specific format flags. --- dlls/wined3d/buffer.c | 5 +- dlls/wined3d/context.c | 7 ++- dlls/wined3d/directx.c | 25 +++++---- dlls/wined3d/resource.c | 5 +- dlls/wined3d/surface.c | 23 ++++---- dlls/wined3d/texture.c | 19 ++++--- dlls/wined3d/utils.c | 119 +++++++++++++++++++++++------------------ dlls/wined3d/view.c | 2 +- dlls/wined3d/volume.c | 4 +- dlls/wined3d/wined3d_private.h | 8 +-- 10 files changed, 125 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c0ed9ce0af5370f89605…

1 0

Matteo Bruni : wined3d: Drop glPrioritizeTextures() call.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 7928ffaca5288b56fcc0b4b95cd4a54fcede707a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7928ffaca5288b56fcc0b4b95… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 23 22:41:15 2015 +0200 wined3d: Drop glPrioritizeTextures() call. It's not supported on core profiles and I doubt it matters anyway. For the records, the default value is 1 so this was actually lowering the priority for DEFAULT pool textures. --- dlls/wined3d/texture.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index de92e0e..1a87386 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -187,13 +187,6 @@ void wined3d_texture_bind(struct wined3d_texture *texture, return; } - if (texture->resource.pool == WINED3D_POOL_DEFAULT) - { - /* Tell OpenGL to try and keep this texture in video ram (well mostly). */ - GLclampf tmp = 0.9f; - gl_info->gl_ops.gl.p_glPrioritizeTextures(1, &gl_tex->name, &tmp); - } - /* Initialise the state of the texture object to the OpenGL defaults, not * the wined3d defaults. */ gl_tex->sampler_desc.address_u = WINED3D_TADDRESS_WRAP;

1 0

Matteo Bruni : wined3d: Fix specular lighting for non-local viewer.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: d6db6c729532f5f9320db1d376ef034342450a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6db6c729532f5f9320db1d37… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 23 22:41:13 2015 +0200 wined3d: Fix specular lighting for non-local viewer. The viewer is in the (0.0, 0.0, -1.0) direction in the D3D coordinate system. --- dlls/wined3d/glsl_shader.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7874a69..4c0266f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5280,7 +5280,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer if (settings->localviewer) shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else - shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, 1.0)));\n"); + shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); shader_addline(buffer, "if (t > 0.0) specular += (pow(t, gl_FrontMaterial.shininess)" " * gl_LightSource[%u].specular) / att;\n", i); break; @@ -5305,7 +5305,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer if (settings->localviewer) shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else - shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, 1.0)));\n"); + shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); shader_addline(buffer, "if (t > 0.0) specular += (pow(t, gl_FrontMaterial.shininess)" " * gl_LightSource[%u].specular) * att;\n", i); break; @@ -5317,7 +5317,12 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer shader_addline(buffer, "dir = normalize(gl_LightSource[%u].position.xyz);\n", i); shader_addline(buffer, "diffuse += clamp(dot(dir, normal), 0.0, 1.0)" " * gl_LightSource[%u].diffuse.xyz;\n", i); - shader_addline(buffer, "t = dot(normal, gl_LightSource[%u].halfVector.xyz);\n", i); + /* TODO: In the non-local viewer case the halfvector is constant + * and could be precomputed and stored in a uniform. */ + if (settings->localviewer) + shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); + else + shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); shader_addline(buffer, "if (t > 0.0) specular += pow(t, gl_FrontMaterial.shininess)" " * gl_LightSource[%u].specular;\n", i); break;

1 0

Thomas Faber : ntdll/tests: Avoid printing an unterminated string (DPH).
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 3d9693fa617034c7f11c2408f0191c6ee4b88834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9693fa617034c7f11c2408f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Apr 23 20:42:50 2015 +0200 ntdll/tests: Avoid printing an unterminated string (DPH). --- dlls/ntdll/tests/reg.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 0af009f..6d04668 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -204,22 +204,9 @@ static NTSTATUS WINAPI QueryRoutine (IN PCWSTR ValueName, IN ULONG ValueType, IN IN ULONG ValueLength, IN PVOID Context, IN PVOID EntryContext) { NTSTATUS ret = STATUS_SUCCESS; - int ValueNameLength = 0; - LPSTR ValName = 0; - trace("**Test %d**\n", CurrentTest); - - if(ValueName) - { - ValueNameLength = lstrlenW(ValueName); - - ValName = pRtlAllocateHeap(GetProcessHeap(), 0, ValueNameLength); - - WideCharToMultiByte(CP_ACP, 0, ValueName, ValueNameLength+1, ValName, ValueNameLength, NULL, NULL); - trace("ValueName: %s\n", ValName); - } - else - trace("ValueName: (null)\n"); + trace("**Test %d**\n", CurrentTest); + trace("ValueName: %s\n", wine_dbgstr_w(ValueName)); switch(ValueType) { @@ -262,9 +249,6 @@ static NTSTATUS WINAPI QueryRoutine (IN PCWSTR ValueName, IN ULONG ValueType, IN CurrentTest++; - if(ValName) - pRtlFreeHeap(GetProcessHeap(), 0, ValName); - return ret; }

1 0

Henri Verbeet : d2d1: Take scaling into account for the source offset in d2d_d3d_render_target_DrawBitmap ().
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: b313680ab4d723fb6fc45581e3dfca9958bfe526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b313680ab4d723fb6fc45581e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:25 2015 +0200 d2d1: Take scaling into account for the source offset in d2d_d3d_render_target_DrawBitmap(). --- dlls/d2d1/render_target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index f8bdf95..757cdac 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -779,10 +779,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget brush_desc.opacity = opacity; brush_desc.transform._11 = fabsf((d.right - d.left) / (s.right - s.left)); brush_desc.transform._21 = 0.0f; - brush_desc.transform._31 = min(d.left, d.right) - min(s.left, s.right); + brush_desc.transform._31 = min(d.left, d.right) - min(s.left, s.right) * brush_desc.transform._11; brush_desc.transform._12 = 0.0f; brush_desc.transform._22 = fabsf((d.bottom - d.top) / (s.bottom - s.top)); - brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom); + brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom) * brush_desc.transform._22; if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) {

1 0

Nikolay Sivov : msdmo: Added a helper to duplicate partial media type arrays.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 55620f097cdbee98f4c4113c3441a50539eb63bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=55620f097cdbee98f4c4113c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 10:08:18 2015 +0300 msdmo: Added a helper to duplicate partial media type arrays. --- dlls/msdmo/dmoreg.c | 53 +++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 7a81398..7ae01a1 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -360,6 +360,21 @@ HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR name[]) return S_FALSE; } +static HRESULT dup_partial_mediatype(const DMO_PARTIAL_MEDIATYPE *types, DWORD count, DMO_PARTIAL_MEDIATYPE **ret) +{ + *ret = NULL; + + if (count == 0) + return S_OK; + + *ret = HeapAlloc(GetProcessHeap(), 0, count*sizeof(*types)); + if (!*ret) + return E_OUTOFMEMORY; + + memcpy(*ret, types, count*sizeof(*types)); + return S_OK; +} + /************************************************************************** * IEnumDMO_Constructor */ @@ -373,8 +388,7 @@ static HRESULT IEnumDMO_Constructor( IEnumDMO **obj) { IEnumDMOImpl* lpedmo; - HRESULT hr = S_OK; - UINT size; + HRESULT hr; LONG ret; *obj = NULL; @@ -388,32 +402,16 @@ static HRESULT IEnumDMO_Constructor( lpedmo->index = -1; lpedmo->category = *guidCategory; lpedmo->dwFlags = dwFlags; + lpedmo->cInTypes = cInTypes; + lpedmo->cOutTypes = cOutTypes; - if (cInTypes > 0) - { - size = cInTypes * sizeof(DMO_PARTIAL_MEDIATYPE); - lpedmo->pInTypes = HeapAlloc(GetProcessHeap(), 0, size); - if (!lpedmo->pInTypes) - { - hr = E_OUTOFMEMORY; - goto lerr; - } - memcpy(lpedmo->pInTypes, pInTypes, size); - lpedmo->cInTypes = cInTypes; - } + hr = dup_partial_mediatype(pInTypes, cInTypes, &lpedmo->pInTypes); + if (FAILED(hr)) + goto lerr; - if (cOutTypes > 0) - { - size = cOutTypes * sizeof(DMO_PARTIAL_MEDIATYPE); - lpedmo->pOutTypes = HeapAlloc(GetProcessHeap(), 0, size); - if (!lpedmo->pOutTypes) - { - hr = E_OUTOFMEMORY; - goto lerr; - } - memcpy(lpedmo->pOutTypes, pOutTypes, size); - lpedmo->cOutTypes = cOutTypes; - } + hr = dup_partial_mediatype(pOutTypes, cOutTypes, &lpedmo->pOutTypes); + if (FAILED(hr)) + goto lerr; /* If not filtering by category enum from media objects root */ if (IsEqualGUID(guidCategory, &GUID_NULL)) @@ -426,8 +424,7 @@ static HRESULT IEnumDMO_Constructor( WCHAR szguid[64]; WCHAR szKey[MAX_PATH]; - wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, - GUIDToString(szguid, guidCategory)); + wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, GUIDToString(szguid, guidCategory)); if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey))) hr = HRESULT_FROM_WIN32(ret); }

1 0