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

Matteo Bruni : ddraw/tests: Add more d3d7 lighting tests.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 319e7fb2019f58c9368f7fcb455c9cfd6ce1d93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=319e7fb2019f58c9368f7fcb4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 21 15:11:20 2015 +0200 ddraw/tests: Add more d3d7 lighting tests. --- dlls/ddraw/tests/ddraw7.c | 225 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 132 +-------------------------- 2 files changed, 229 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=319e7fb2019f58c9368f7…

1 0

Matteo Bruni : d3d8/tests: Add a lighting test with non-affine worldview matrix.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 589f1072df9535104c074e5382ef7d8ce28f0f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589f1072df9535104c074e538… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 21 15:11:19 2015 +0200 d3d8/tests: Add a lighting test with non-affine worldview matrix. --- dlls/d3d8/tests/visual.c | 110 ++++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 54 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 737bb91..652e2dd 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -185,6 +185,7 @@ static void lighting_test(void) ULONG refcount; HWND window; HRESULT hr; + unsigned int i; static const struct { @@ -238,6 +239,13 @@ static void lighting_test(void) {{-10.0f, -9.0f, 11.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, {{-10.0f, -9.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, {{-10.0f, -11.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, + }, + translatedquad[] = + { + {{-11.0f, -11.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{-11.0f, -9.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ -9.0f, -9.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ -9.0f, -11.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, }; static const WORD indices[] = {0, 1, 2, 2, 3, 0}; static const D3DMATRIX mat = @@ -252,7 +260,7 @@ static void lighting_test(void) 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, + 0.0f, 0.0f, 0.5f, 1.0f, }}}, mat_transf = {{{ @@ -260,7 +268,34 @@ static void lighting_test(void) 0.0f, 1.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 10.f, 10.0f, 10.0f, 1.0f, - }}}; + }}}, + mat_nonaffine = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, -1.0f, + 10.f, 10.0f, 10.0f, 0.0f, + }}}; + static const struct + { + const D3DMATRIX *world_matrix; + const void *quad; + unsigned int size; + DWORD expected; + const char *message; + BOOL todo; + } + tests[] = + { + {&mat, nquad, sizeof(nquad[0]), 0x000000ff, + "Lit quad with light", FALSE}, + {&mat_singular, nquad, sizeof(nquad[0]), 0x000000ff, + "Lit quad with singular world matrix", FALSE}, + {&mat_transf, rotatedquad, sizeof(rotatedquad[0]), 0x000000ff, + "Lit quad with transformation matrix", FALSE}, + {&mat_nonaffine, translatedquad, sizeof(translatedquad[0]), 0x00000000, + "Lit quad with non-affine matrix", TRUE}, + }; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -340,66 +375,33 @@ static void lighting_test(void) IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, TRUE); - ok(SUCCEEDED(hr), "Failed to enable lighting, hr %#x.\n", hr); hr = IDirect3DDevice8_LightEnable(device, 0, TRUE); ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - color = getPixelColor(device, 320, 240); - ok(color == 0x000000ff, "Lit quad with light has color 0x%08x.\n", color); - - hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat_singular); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - color = getPixelColor(device, 160, 240); - ok(color == 0x00ffffff, "Cleared area has color 0x%08x.\n", color); - color = getPixelColor(device, 480, 240); - ok(color == 0x000000ff, "Lit quad with singular world matrix has color 0x%08x.\n", color); - - hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat_transf); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, tests[i].world_matrix); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, rotatedquad, sizeof(rotatedquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, tests[i].quad, tests[i].size); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color == 0x000000ff, "Lit quad with transformation matrix has color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + if (tests[i].todo) + todo_wine ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + else + ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + } refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Matteo Bruni : d3d9/tests: Add a lighting test with non-affine worldview matrix.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 92cb56a2f8d430bb703831ef0f29cbb38eb9aced URL: http://source.winehq.org/git/wine.git/?a=commit;h=92cb56a2f8d430bb703831ef0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 21 15:11:18 2015 +0200 d3d9/tests: Add a lighting test with non-affine worldview matrix. --- dlls/d3d9/tests/visual.c | 108 ++++++++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 53 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 518a48a..eb715d7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -262,6 +262,7 @@ static void lighting_test(void) ULONG refcount; HWND window; HRESULT hr; + unsigned int i; static const D3DMATRIX mat = {{{ @@ -275,7 +276,7 @@ static void lighting_test(void) 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, + 0.0f, 0.0f, 0.5f, 1.0f, }}}, mat_transf = {{{ @@ -283,6 +284,13 @@ static void lighting_test(void) 0.0f, 1.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 10.f, 10.0f, 10.0f, 1.0f, + }}}, + mat_nonaffine = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, -1.0f, + 10.f, 10.0f, 10.0f, 0.0f, }}}; static const struct { @@ -343,8 +351,35 @@ static void lighting_test(void) {{-10.0f, -9.0f, 11.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, {{-10.0f, -9.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, {{-10.0f, -11.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, + }, + translatedquad[] = + { + {{-11.0f, -11.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{-11.0f, -9.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ -9.0f, -9.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ -9.0f, -11.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, }; static const WORD indices[] = {0, 1, 2, 2, 3, 0}; + static const struct + { + const D3DMATRIX *world_matrix; + const void *quad; + unsigned int size; + DWORD expected; + const char *message; + BOOL todo; + } + tests[] = + { + {&mat, nquad, sizeof(nquad[0]), 0x000000ff, + "Lit quad with light", FALSE}, + {&mat_singular, nquad, sizeof(nquad[0]), 0x000000ff, + "Lit quad with singular world matrix", FALSE}, + {&mat_transf, rotatedquad, sizeof(rotatedquad[0]), 0x000000ff, + "Lit quad with transformation matrix", FALSE}, + {&mat_nonaffine, translatedquad, sizeof(translatedquad[0]), 0x00000000, + "Lit quad with non-affine matrix", TRUE}, + }; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -424,66 +459,33 @@ static void lighting_test(void) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, TRUE); - ok(SUCCEEDED(hr), "Failed to enable lighting, hr %#x.\n", hr); hr = IDirect3DDevice9_LightEnable(device, 0, TRUE); ok(SUCCEEDED(hr), "Failed to enable light 0, 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, 4, - 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[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); - - color = getPixelColor(device, 320, 240); - ok(color == 0x000000ff, "Lit quad with light has color 0x%08x.\n", color); - - hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat_singular); - ok(SUCCEEDED(hr), "Failed to set world transform, 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, 4, - 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[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); - - color = getPixelColor(device, 160, 240); - ok(color == 0x00ffffff, "Cleared area has color 0x%08x.\n", color); - color = getPixelColor(device, 480, 240); - ok(color == 0x000000ff, "Lit quad with singular world matrix has color 0x%08x.\n", color); - - hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat_transf); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, tests[i].world_matrix); + ok(SUCCEEDED(hr), "Failed to set world transform, 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_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_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, rotatedquad, sizeof(rotatedquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, tests[i].quad, tests[i].size); + 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); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color == 0x000000ff, "Lit quad with transformation matrix has color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + if (tests[i].todo) + todo_wine ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + else + ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + } hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr);

1 0

Matteo Bruni : opengl32: Update to the current OpenGL spec.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 6c6f92ee42b518d0e6cd97195b4ca9b4fae20114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6f92ee42b518d0e6cd97195… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 21 15:11:17 2015 +0200 opengl32: Update to the current OpenGL spec. --- dlls/opengl32/opengl_ext.c | 181 ++++++++++++++++++++++++++++++++++++-------- dlls/opengl32/opengl_norm.c | 58 +++++++++++--- include/wine/wgl.h | 56 ++++++++++++-- include/wine/wgl_driver.h | 39 +++++++--- 4 files changed, 275 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c6f92ee42b518d0e6cd9…

1 0

Thomas Faber : ntdll/tests: Ensure 4-byte alignment for ATOM_BASIC_INFORMATION.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: bb781b44681ea5743fa62b6c2a71d32ce882b9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb781b44681ea5743fa62b6c2… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Apr 21 17:14:08 2015 +0200 ntdll/tests: Ensure 4-byte alignment for ATOM_BASIC_INFORMATION. --- dlls/ntdll/tests/atom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index 0fed630..972a54e 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -432,9 +432,9 @@ static void test_Global(void) { NTSTATUS res; RTL_ATOM atom; - char ptr[sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR)]; + ULONG ptr[(sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR)) / sizeof(ULONG)]; ATOM_BASIC_INFORMATION* abi = (ATOM_BASIC_INFORMATION*)ptr; - ULONG ptr_size = sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR); + ULONG ptr_size = sizeof(ptr); if (pNtAddAtomNT4) res = pNtAddAtomNT4(testAtom1, &atom);

1 0

Stefan Dösinger : wined3d: Shadow format flags in the resource.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 9076612e2de0d52f2f526241283157b11eb989e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9076612e2de0d52f2f5262412… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 22 11:30:15 2015 +0200 wined3d: Shadow format flags in the resource. --- dlls/wined3d/context.c | 7 ++++--- dlls/wined3d/cs.c | 4 +++- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/resource.c | 39 ++++++++++++++++++++------------------ dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/surface.c | 43 ++++++++++++++++++++++++++---------------- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/volume.c | 11 ++++++----- dlls/wined3d/wined3d_private.h | 1 + 10 files changed, 69 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9076612e2de0d52f2f526…

1 0

Nikolay Sivov : wbemprox: Fix BSTR leaks caused by incorrect use of SafeArrayPutElement() (Valgrind ).
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 84a8ae79d289e403456a740f701d0ebe90ae88d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a8ae79d289e403456a740f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 22 13:13:55 2015 +0300 wbemprox: Fix BSTR leaks caused by incorrect use of SafeArrayPutElement() (Valgrind). --- dlls/wbemprox/query.c | 2 ++ dlls/wbemprox/reg.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 7ae9a0f..6f66603 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -700,6 +700,7 @@ SAFEARRAY *to_safearray( const struct array *array, CIMTYPE type ) SafeArrayDestroy( ret ); return NULL; } + SysFreeString( str ); } else if (SafeArrayPutElement( ret, &i, ptr ) != S_OK) { @@ -1002,6 +1003,7 @@ HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) SafeArrayDestroy( sa ); return E_OUTOFMEMORY; } + SysFreeString( str ); j++; } *props = sa; diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 4bf249b..7544c3c 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -51,6 +51,12 @@ static HRESULT to_bstr_array( BSTR *strings, DWORD count, VARIANT *var ) return S_OK; } +static void free_bstr_array( BSTR *strings, DWORD count ) +{ + while (count--) + SysFreeString( *(strings++) ); +} + static HRESULT to_i4_array( DWORD *values, DWORD count, VARIANT *var ) { SAFEARRAY *sa; @@ -114,7 +120,11 @@ static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, VARIANT } i++; } - if (hr == S_OK && !res) hr = to_bstr_array( strings, i, names ); + if (hr == S_OK && !res) + { + hr = to_bstr_array( strings, i, names ); + free_bstr_array( strings, i ); + } set_variant( VT_UI4, res, NULL, retval ); RegCloseKey( hkey ); heap_free( strings ); @@ -218,6 +228,7 @@ static HRESULT enum_values( HKEY root, const WCHAR *subkey, VARIANT *names, VARI if (hr == S_OK && !res) { hr = to_bstr_array( value_names, i, names ); + free_bstr_array( value_names, i ); if (hr == S_OK) hr = to_i4_array( value_types, i, types ); }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.41
by Jeremy Newman April 21, 2015

April 21, 2015

Module: website Branch: master Commit: 63f436288a4cabf492febe9297cc9321f167216d URL: http://source.winehq.org/git/website.git/?a=commit;h=63f436288a4cabf492febe… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Apr 20 19:03:29 2015 +0200 Polish translation for release 1.7.41 --- news/pl/2015041701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2015041701.xml b/news/pl/2015041701.xml new file mode 100644 index 0000000..f89f56b --- /dev/null +++ b/news/pl/2015041701.xml @@ -0,0 +1,16 @@ +<news> +<date>Kwiecień 17, 2015</date> +<title>Wydano Wine 1.7.41</title> +<body> + Wydanie rozwojowe Wine 1.7.41 jest już dostępne. + <a href="{$root}/announce/1.7.41">Co nowego</a> w tym wydaniu: +<ul> + <li>W powłoce obsługiwanych jest więcej Znanych Folderów.</li> + <li>Szersza obsługa dla obiektów zadań jądra.</li> + <li>Więcej ulepszeń w zakresie łatek MSI.</li> + <li>Kilka poprawek do mechanizmu skórek.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.41.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Nikolay Sivov : dwrite: Added a helper to get source text pointer.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: e0403efc21dcc550fead30dd2110fe8af7f4e0d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0403efc21dcc550fead30dd2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 21 13:36:01 2015 +0300 dwrite: Added a helper to get source text pointer. --- dlls/dwrite/analyzer.c | 87 +++++++++++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 32 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5985d2d..02d90db 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -676,19 +676,66 @@ static ULONG WINAPI dwritetextanalyzer_Release(IDWriteTextAnalyzer2 *iface) return 1; } +/* This helper tries to get 'length' chars from a source, allocating a buffer only if source failed to provide enough + data after a first request. */ +static HRESULT get_text_source_ptr(IDWriteTextAnalysisSource *source, UINT32 position, UINT32 length, const WCHAR **text, WCHAR **buff) +{ + HRESULT hr; + UINT32 len; + + *buff = NULL; + *text = NULL; + len = 0; + hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, position, text, &len); + if (FAILED(hr)) return hr; + + if (len < length) { + UINT32 read; + + *buff = heap_alloc(length*sizeof(WCHAR)); + if (!*buff) + return E_OUTOFMEMORY; + memcpy(*buff, *text, len*sizeof(WCHAR)); + read = len; + + while (read < length && *text) { + *text = NULL; + len = 0; + hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, read, text, &len); + if (FAILED(hr)) { + heap_free(*buff); + return hr; + } + memcpy(*buff + read, *text, min(len, length-read)*sizeof(WCHAR)); + read += len; + } + + *text = *buff; + } + + return hr; +} + static HRESULT WINAPI dwritetextanalyzer_AnalyzeScript(IDWriteTextAnalyzer2 *iface, IDWriteTextAnalysisSource* source, UINT32 position, UINT32 length, IDWriteTextAnalysisSink* sink) { + WCHAR *buff = NULL; const WCHAR *text; HRESULT hr; - UINT32 len; TRACE("(%p %u %u %p)\n", source, position, length, sink); - hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, position, &text, &len); - if (FAILED(hr)) return hr; + if (length == 0) + return S_OK; + + hr = get_text_source_ptr(source, position, length, &text, &buff); + if (FAILED(hr)) + return hr; - return analyze_script(text, len, sink); + hr = analyze_script(text, length, sink); + heap_free(buff); + + return hr; } static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface, @@ -698,7 +745,7 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface UINT8 baselevel, level, explicit_level; WCHAR *buff = NULL; const WCHAR *text; - UINT32 len, pos, i; + UINT32 pos, i; HRESULT hr; TRACE("(%p %u %u %p)\n", source, position, length, sink); @@ -706,33 +753,9 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface if (length == 0) return S_OK; - /* get some, check for length */ - text = NULL; - len = 0; - hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, position, &text, &len); - if (FAILED(hr)) return hr; - - if (len < length) { - UINT32 read; - - buff = heap_alloc(length*sizeof(WCHAR)); - if (!buff) - return E_OUTOFMEMORY; - memcpy(buff, text, len*sizeof(WCHAR)); - read = len; - - while (read < length && text) { - text = NULL; - len = 0; - hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, read, &text, &len); - if (FAILED(hr)) - goto done; - memcpy(&buff[read], text, min(len, length-read)*sizeof(WCHAR)); - read += len; - } - - text = buff; - } + hr = get_text_source_ptr(source, position, length, &text, &buff); + if (FAILED(hr)) + return hr; levels = heap_alloc(length*sizeof(*levels)); explicit = heap_alloc(length*sizeof(*explicit));

1 0

Henri Verbeet : wined3d: Completely initialize "correction_params" in shader_glsl_load_constants() (Valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: de1450788b99f8976b1c49b74d352f6a24bb2cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1450788b99f8976b1c49b74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:52 2015 +0200 wined3d: Completely initialize "correction_params" in shader_glsl_load_constants() (Valgrind). Leaving the last two elements uninitialized is mostly harmless since the shader doesn't actually use them, but the driver might try to do some kind of analysis on them. --- dlls/wined3d/glsl_shader.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b1a0f85..84fc1a2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -944,17 +944,15 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context if (update_mask & WINED3D_SHADER_CONST_PS_Y_CORR) { - float correction_params[4]; - - if (context->render_offscreen) + float correction_params[] = { - correction_params[0] = 0.0f; - correction_params[1] = 1.0f; - } else { /* position is window relative, not viewport relative */ - correction_params[0] = (float) context->current_rt->resource.height; - correction_params[1] = -1.0f; - } + context->render_offscreen ? 0.0f : (float)context->current_rt->resource.height, + context->render_offscreen ? 1.0f : -1.0f, + 0.0f, + 0.0f, + }; + GL_EXTCALL(glUniform4fv(prog->ps.ycorrection_location, 1, correction_params)); }

1 0