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

Matteo Bruni : d3d9/tests: Test the default colors for fixed function vertex processing.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 4611ad8befb13de377eba71cb40fe2ae2389826d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4611ad8befb13de377eba71cb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 11 23:13:39 2015 +0200 d3d9/tests: Test the default colors for fixed function vertex processing. --- dlls/d3d9/tests/visual.c | 110 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 102 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c0ed616..f9cb71c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8365,7 +8365,7 @@ done: static void fixed_function_decl_test(void) { IDirect3DVertexDeclaration9 *dcl_float = NULL, *dcl_short = NULL, *dcl_ubyte = NULL, *dcl_color = NULL; - IDirect3DVertexDeclaration9 *dcl_color_2 = NULL, *dcl_ubyte_2 = NULL, *dcl_positiont; + IDirect3DVertexDeclaration9 *dcl_color_2 = NULL, *dcl_ubyte_2 = NULL, *dcl_nocolor, *dcl_positiont; IDirect3DVertexBuffer9 *vb, *vb2; IDirect3DDevice9 *device; BOOL s_ok, ub_ok, f_ok; @@ -8407,6 +8407,10 @@ static void fixed_function_decl_test(void) {0, 12, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, D3DDECL_END() }; + static const D3DVERTEXELEMENT9 decl_elements_nocolor[] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END() + }; static const D3DVERTEXELEMENT9 decl_elements_positiont[] = { {0, 0, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITIONT, 0}, {0, 16, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, @@ -8544,6 +8548,8 @@ static void fixed_function_decl_test(void) } hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_d3dcolor_2streams, &dcl_color_2); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_nocolor, &dcl_nocolor); + ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_positiont, &dcl_positiont); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); @@ -8629,6 +8635,8 @@ static void fixed_function_decl_test(void) * It makes sure that the vertex buffer one works, while the above tests * whether the immediate mode code works. */ f_ok = FALSE; s_ok = FALSE; ub_ok = FALSE; + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 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); @@ -8698,11 +8706,6 @@ static void fixed_function_decl_test(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed with %08x\n", hr); - hr = IDirect3DDevice9_SetVertexDeclaration(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed (%08x)\n", hr); - if(dcl_short) { color = getPixelColor(device, 480, 360); ok(color == 0x000000ff || !s_ok, @@ -8725,8 +8728,95 @@ static void fixed_function_decl_test(void) } IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + /* Test with no diffuse color attribute. */ hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexDeclaration(device, dcl_nocolor); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quads, sizeof(float) * 3); + 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, 360); + ok(color == 0x00ffffff, "Got unexpected color 0x%08x in the no color attribute test.\n", color); + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + + /* Test what happens with specular lighting enabled and no specular color attribute. */ + f_ok = FALSE; s_ok = FALSE; ub_ok = FALSE; + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SPECULARENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable specular lighting, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + if (dcl_color) + { + hr = IDirect3DDevice9_SetVertexDeclaration(device, dcl_color); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(quad1[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + } + if (dcl_ubyte) + { + hr = IDirect3DDevice9_SetVertexDeclaration(device, dcl_ubyte); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(quad2[0])); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ub_ok = SUCCEEDED(hr); + } + if (dcl_short) + { + hr = IDirect3DDevice9_SetVertexDeclaration(device, dcl_short); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad3, sizeof(quad3[0])); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + s_ok = SUCCEEDED(hr); + } + if (dcl_float) + { + hr = IDirect3DDevice9_SetVertexDeclaration(device, dcl_float); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad4, sizeof(quad4[0])); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + f_ok = SUCCEEDED(hr); + } + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SPECULARENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable specular lighting, hr %#x.\n", hr); + + if (dcl_short) + { + color = getPixelColor(device, 480, 360); + ok(color == 0x000000ff || !s_ok, + "D3DDECLTYPE_USHORT4N returned color %08x, expected 0x000000ff.\n", color); + } + if (dcl_ubyte) + { + color = getPixelColor(device, 160, 120); + ok(color == 0x0000ffff || !ub_ok, + "D3DDECLTYPE_UBYTE4N returned color %08x, expected 0x0000ffff.\n", color); + } + if (dcl_color) + { + color = getPixelColor(device, 160, 360); + ok(color == 0x00ffff00, + "D3DDECLTYPE_D3DCOLOR returned color %08x, expected 0x00ffff00.\n", color); + } + if (dcl_float) + { + color = getPixelColor(device, 480, 120); + ok(color == 0x00ff0000 || !f_ok, + "D3DDECLTYPE_FLOAT4 returned color %08x, expected 0x00ff0000.\n", color); + } + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad_transformed), &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %08x\n", hr); @@ -8737,6 +8827,9 @@ static void fixed_function_decl_test(void) hr = IDirect3DDevice9_SetVertexDeclaration(device, dcl_positiont); ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed with %08x\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); + hr = IDirect3DDevice9_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(quad_transformed[0])); @@ -8895,7 +8988,8 @@ out: if(dcl_color) IDirect3DVertexDeclaration9_Release(dcl_color); if(dcl_color_2) IDirect3DVertexDeclaration9_Release(dcl_color_2); if(dcl_ubyte_2) IDirect3DVertexDeclaration9_Release(dcl_ubyte_2); - if(dcl_positiont) IDirect3DVertexDeclaration9_Release(dcl_positiont); + IDirect3DVertexDeclaration9_Release(dcl_nocolor); + IDirect3DVertexDeclaration9_Release(dcl_positiont); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done:

1 0

Matteo Bruni : d3d8/tests: Port the vertex shader input test to D3D8.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: ddefb49a301446db09da16ce53edfeb28bc591d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddefb49a301446db09da16ce5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 11 23:13:40 2015 +0200 d3d8/tests: Port the vertex shader input test to D3D8. --- dlls/d3d8/tests/visual.c | 288 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 288 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ddefb49a301446db09da1…

1 0

Matteo Bruni : d3d8/tests: Port part of the fixed function attributes test to D3D8.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 92a2cef7a8d21d113b249a78e9d838b5f3448a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a2cef7a8d21d113b249a78e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 11 23:13:41 2015 +0200 d3d8/tests: Port part of the fixed function attributes test to D3D8. --- dlls/d3d8/tests/visual.c | 193 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 3b5f91d..db9fb79 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -7363,6 +7363,198 @@ done: DestroyWindow(window); } +static void test_fixed_function_fvf(void) +{ + IDirect3DDevice8 *device; + DWORD color; + IDirect3D8 *d3d; + ULONG refcount; + D3DCAPS8 caps; + HWND window; + HRESULT hr; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad1[] = + { + {{-1.0f, -1.0f, 0.1f}, 0x00ffff00}, + {{-1.0f, 0.0f, 0.1f}, 0x00ffff00}, + {{ 0.0f, -1.0f, 0.1f}, 0x00ffff00}, + {{ 0.0f, 0.0f, 0.1f}, 0x00ffff00}, + }; + static const struct vec3 quad2[] = + { + {-1.0f, -1.0f, 0.1f}, + {-1.0f, 0.0f, 0.1f}, + { 0.0f, -1.0f, 0.1f}, + { 0.0f, 0.0f, 0.1f}, + }; + static const struct + { + struct vec4 position; + DWORD diffuse; + } + quad_transformed[] = + { + {{ 90.0f, 110.0f, 0.1f, 2.0f}, 0x00ffff00}, + {{570.0f, 110.0f, 0.1f, 2.0f}, 0x00ffff00}, + {{ 90.0f, 300.0f, 0.1f, 2.0f}, 0x00ffff00}, + {{570.0f, 300.0f, 0.1f, 2.0f}, 0x00ffff00}, + }; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(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; + } + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(quad1[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, 360); + ok(color == 0x00ffff00, + "D3DDECLTYPE_D3DCOLOR returned color %08x, expected 0x00ffff00\n", color); + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + + /* Test with no diffuse color attribute. */ + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(SUCCEEDED(hr), "IDirect3DDevice8_Clear failed with %08x\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad2, sizeof(quad2[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, 360); + ok(color == 0x00ffffff, "Got unexpected color 0x%08x in the no diffuse attribute test.\n", color); + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + + /* Test what happens with specular lighting enabled and no specular color attribute. */ + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SPECULARENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable specular lighting, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad1, sizeof(quad1[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); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SPECULARENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable specular lighting, hr %#x.\n", hr); + + color = getPixelColor(device, 160, 360); + ok(color == 0x00ffff00, "Got unexpected color 0x%08x in the no specular attribute test.\n", color); + + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 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_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad_transformed, sizeof(quad_transformed[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, 88, 108); + ok(color == 0x000000ff, + "pixel 88/108 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 92, 108); + ok(color == 0x000000ff, + "pixel 92/108 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 88, 112); + ok(color == 0x000000ff, + "pixel 88/112 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 92, 112); + ok(color == 0x00ffff00, + "pixel 92/112 has color %08x, expected 0x00ffff00\n", color); + + color = getPixelColor(device, 568, 108); + ok(color == 0x000000ff, + "pixel 568/108 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 572, 108); + ok(color == 0x000000ff, + "pixel 572/108 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 568, 112); + ok(color == 0x00ffff00, + "pixel 568/112 has color %08x, expected 0x00ffff00\n", color); + color = getPixelColor(device, 572, 112); + ok(color == 0x000000ff, + "pixel 572/112 has color %08x, expected 0x000000ff\n", color); + + color = getPixelColor(device, 88, 298); + ok(color == 0x000000ff, + "pixel 88/298 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 92, 298); + ok(color == 0x00ffff00, + "pixel 92/298 has color %08x, expected 0x00ffff00\n", color); + color = getPixelColor(device, 88, 302); + ok(color == 0x000000ff, + "pixel 88/302 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 92, 302); + ok(color == 0x000000ff, + "pixel 92/302 has color %08x, expected 0x000000ff\n", color); + + color = getPixelColor(device, 568, 298); + ok(color == 0x00ffff00, + "pixel 568/298 has color %08x, expected 0x00ffff00\n", color); + color = getPixelColor(device, 572, 298); + ok(color == 0x000000ff, + "pixel 572/298 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 568, 302); + ok(color == 0x000000ff, + "pixel 568/302 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 572, 302); + ok(color == 0x000000ff, + "pixel 572/302 has color %08x, expected 0x000000ff\n", color); + + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -7422,4 +7614,5 @@ START_TEST(visual) test_multisample_mismatch(); test_texcoordindex(); test_vshader_input(); + test_fixed_function_fvf(); }

1 0

Matteo Bruni : wined3d: Avoid the builtin GLSL vertex attributes.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 4189d297760166951641baf6172a1ef708863855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4189d297760166951641baf61… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 11 23:13:42 2015 +0200 wined3d: Avoid the builtin GLSL vertex attributes. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/drawprim.c | 6 ++- dlls/wined3d/glsl_shader.c | 110 +++++++++++++++++++++++++++++------------ dlls/wined3d/state.c | 11 +++-- dlls/wined3d/utils.c | 6 +-- dlls/wined3d/wined3d_private.h | 5 +- 6 files changed, 98 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4189d297760166951641b…

1 0

Alexandre Julliard : Release 1.7.45.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: cde46665fa8503e90c9a2fab1898cdb4d22f667b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde46665fa8503e90c9a2fab1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 12 21:34:31 2015 +0900 Release 1.7.45. --- ANNOUNCE | 716 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 387 insertions(+), 350 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cde46665fa8503e90c9a2…

1 0

Tag wine-1.7.45 : Alexandre Julliard : Release 1.7.45
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: refs/tags/wine-1.7.45 Tag: 6478d66ad69492a731dc49cd164d95600c912443 URL: http://source.winehq.org/git/wine.git/?a=tag;h=6478d66ad69492a731dc49cd164d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 12 21:34:31 2015 +0900 Release 1.7.45

1 0

Marcus Meissner : msi: Free rec in error exit (Coverity).
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: d0cb2519b666fda68515f65662d72b39f6a1f455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0cb2519b666fda68515f6566… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jun 11 16:57:34 2015 +0200 msi: Free rec in error exit (Coverity). --- dlls/msi/patch.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index 5456359..f8f3eaf 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -710,7 +710,10 @@ static UINT patch_add_media( MSIPACKAGE *package, IStorage *storage, MSIPATCHINF msiobj_release( &rec->hdr ); continue; } - if (!(media = msi_alloc( sizeof( *media )))) goto done; + if (!(media = msi_alloc( sizeof( *media )))) { + msiobj_release( &rec->hdr ); + goto done; + } media->disk_id = disk_id; media->last_sequence = MSI_RecordGetInteger( rec, 2 ); media->prompt = msi_dup_record_field( rec, 3 );

1 0

Piotr Caban : msvcr: Add _getch_nolock implementation.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 3bd60974a9d6e7d16ae278824a40d1b5b58fcb5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd60974a9d6e7d16ae278824… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 11 17:54:13 2015 +0200 msvcr: Add _getch_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/console.c | 19 +++++++++++++++---- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9b47401..6e404f2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -890,7 +890,7 @@ @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() -@ stub _getch_nolock +@ cdecl _getch_nolock() @ cdecl _getche() @ stub _getche_nolock @ cdecl _getcwd(str long) MSVCRT__getcwd diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 66ec34c..28de3ab 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1238,7 +1238,7 @@ @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() -@ stub _getch_nolock +@ cdecl _getch_nolock() @ cdecl _getche() @ stub _getche_nolock @ cdecl _getcwd(str long) MSVCRT__getcwd diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2a3a813..c8ba7f7 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1236,7 +1236,7 @@ @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() -@ stub _getch_nolock +@ cdecl _getch_nolock() @ cdecl _getche() @ stub _getche_nolock @ cdecl _getcwd(str long) MSVCRT__getcwd diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e3de8ac..1570805 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -564,7 +564,7 @@ @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() -@ stub _getch_nolock +@ cdecl _getch_nolock() @ cdecl _getche() @ stub _getche_nolock @ cdecl _getcwd(str long) MSVCRT__getcwd diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2de0526..cab5922 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -541,7 +541,7 @@ @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() -@ stub _getch_nolock +@ cdecl _getch_nolock() @ cdecl _getche() @ stub _getche_nolock @ cdecl _getcwd(str long) MSVCRT__getcwd diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 27c0ac2..82e8fb2 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -113,13 +113,12 @@ static const struct {unsigned vk; unsigned ch[4][2];} enh_map[] = { }; /********************************************************************* - * _getch (MSVCRT.@) + * _getch_nolock (MSVCR80.@) */ -int CDECL _getch(void) +int CDECL _getch_nolock(void) { int retval = MSVCRT_EOF; - LOCK_CONSOLE; if (__MSVCRT_console_buffer != MSVCRT_EOF) { retval = __MSVCRT_console_buffer; @@ -179,11 +178,23 @@ int CDECL _getch(void) if (mode) SetConsoleMode(MSVCRT_console_in, mode); } - UNLOCK_CONSOLE; return retval; } /********************************************************************* + * _getch (MSVCRT.@) + */ +int CDECL _getch(void) +{ + int ret; + + LOCK_CONSOLE; + ret = _getch_nolock(); + UNLOCK_CONSOLE; + return ret; +} + +/********************************************************************* * _putch (MSVCRT.@) */ int CDECL _putch(int c)

1 0

Piotr Caban : msvcr: Add _putch_nolock implementation.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 0a600ccde8473465c47bf1c4d67da5d0a98dfb69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a600ccde8473465c47bf1c4d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 11 17:54:28 2015 +0200 msvcr: Add _putch_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/console.c | 22 +++++++++++++++------- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6e404f2..49b9232 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1234,7 +1234,7 @@ @ cdecl _purecall() @ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) -@ stub _putch_nolock +@ cdecl _putch_nolock(long) @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 28de3ab..80e46e0 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1592,7 +1592,7 @@ @ cdecl _purecall() @ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) -@ stub _putch_nolock +@ cdecl _putch_nolock(long) @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c8ba7f7..dba6752 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1600,7 +1600,7 @@ @ cdecl _purecall() @ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) -@ stub _putch_nolock +@ cdecl _putch_nolock(long) @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1570805..c45f447 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -909,7 +909,7 @@ @ cdecl _purecall() @ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) -@ stub _putch_nolock +@ cdecl _putch_nolock(long) @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index cab5922..6948d02 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -884,7 +884,7 @@ @ cdecl _purecall() @ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) -@ stub _putch_nolock +@ cdecl _putch_nolock(long) @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 82e8fb2..8801fc0 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -195,17 +195,25 @@ int CDECL _getch(void) } /********************************************************************* - * _putch (MSVCRT.@) + * _putch_nolock (MSVCR80.@) */ -int CDECL _putch(int c) +int CDECL _putch_nolock(int c) { - int retval = MSVCRT_EOF; DWORD count; - LOCK_CONSOLE; if (WriteConsoleA(MSVCRT_console_out, &c, 1, &count, NULL) && count == 1) - retval = c; - UNLOCK_CONSOLE; - return retval; + return c; + return MSVCRT_EOF; +} + +/********************************************************************* + * _putch (MSVCRT.@) + */ +int CDECL _putch(int c) +{ + LOCK_CONSOLE; + c = _putch_nolock(c); + UNLOCK_CONSOLE; + return c; } /*********************************************************************

1 0

Piotr Caban : msvcr: Add _getche_nolock implementation.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 57754bdb296b05a6e081c3e6727cef55a4f7fe68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57754bdb296b05a6e081c3e67… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 11 17:54:39 2015 +0200 msvcr: Add _getche_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/console.c | 23 +++++++++++++++++------ 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 49b9232..002ed36 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -892,7 +892,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ stub _getdcwd_nolock diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 80e46e0..7b06c5f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1240,7 +1240,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ cdecl _getdiskfree(long ptr) MSVCRT__getdiskfree diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dba6752..64eb2f5 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1238,7 +1238,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ cdecl _getdiskfree(long ptr) MSVCRT__getdiskfree diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c45f447..0bef364 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -566,7 +566,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ stub _getdcwd_nolock diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6948d02..fafed02 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -543,7 +543,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ stub _getdcwd_nolock diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 8801fc0..ed8b728 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -217,20 +217,31 @@ int CDECL _putch(int c) } /********************************************************************* - * _getche (MSVCRT.@) + * _getche_nolock (MSVCR80.@) */ -int CDECL _getche(void) +int CDECL _getche_nolock(void) { int retval; - LOCK_CONSOLE; - retval = _getch(); + retval = _getch_nolock(); if (retval != MSVCRT_EOF) - retval = _putch(retval); - UNLOCK_CONSOLE; + retval = _putch_nolock(retval); return retval; } /********************************************************************* + * _getche (MSVCRT.@) + */ +int CDECL _getche(void) +{ + int ret; + + LOCK_CONSOLE; + ret = _getche_nolock(); + UNLOCK_CONSOLE; + return ret; +} + +/********************************************************************* * _cgets (MSVCRT.@) */ char* CDECL _cgets(char* str)

1 0