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

Guillaume Charifi : xaudio2_7: Implement IXaudio2 interface as stub.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 2cc599d13a7c37f318de2dbb6eabce0d3830169c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc599d13a7c37f318de2dbb6… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Tue Jun 9 13:53:00 2015 +0200 xaudio2_7: Implement IXaudio2 interface as stub. --- dlls/xaudio2_7/xaudio_dll.c | 312 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 295 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cc599d13a7c37f318de2…

1 0

Matteo Bruni : ddraw/tests: Add a test for reordering texture coordinates via D3DTSS_TEXCOORDINDEX.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: cc80f1fd9f40f8f2be68e9d5aa641fc9d5cb96f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc80f1fd9f40f8f2be68e9d5a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 10 22:30:28 2015 +0200 ddraw/tests: Add a test for reordering texture coordinates via D3DTSS_TEXCOORDINDEX. --- dlls/ddraw/tests/ddraw4.c | 183 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 203 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 386 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc80f1fd9f40f8f2be68e…

1 0

Matteo Bruni : d3d8/tests: Add a test for reordering texture coordinates via D3DTSS_TEXCOORDINDEX.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: db1bee5b9e053cc8eb42d52a0ae37e13145824e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db1bee5b9e053cc8eb42d52a0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 10 22:30:27 2015 +0200 d3d8/tests: Add a test for reordering texture coordinates via D3DTSS_TEXCOORDINDEX. --- dlls/d3d8/tests/visual.c | 176 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c180dfe..b7be4bc 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -6901,6 +6901,181 @@ done: DestroyWindow(window); } +static void test_texcoordindex(void) +{ + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + }}}; + static const struct + { + struct vec3 pos; + struct vec2 texcoord1; + struct vec2 texcoord2; + struct vec2 texcoord3; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f}, {0.0f, 0.0f}, {1.0f, 1.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 1.0f}, {1.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f}, {1.0f, 0.0f}, {0.0f, 1.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f}, {1.0f, 1.0f}, {0.0f, 0.0f}}, + }; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + HWND window; + HRESULT hr; + IDirect3DTexture8 *texture1, *texture2; + D3DLOCKED_RECT locked_rect; + ULONG refcount; + D3DCOLOR color; + DWORD *ptr; + + 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"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture1); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture2); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = IDirect3DTexture8_LockRect(texture1, 0, &locked_rect, NULL, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); + ptr = locked_rect.pBits; + ptr[0] = 0xff000000; + ptr[1] = 0xff00ff00; + ptr[2] = 0xff0000ff; + ptr[3] = 0xff00ffff; + hr = IDirect3DTexture8_UnlockRect(texture1, 0); + ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); + + hr = IDirect3DTexture8_LockRect(texture2, 0, &locked_rect, NULL, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); + ptr = locked_rect.pBits; + ptr[0] = 0xff000000; + ptr[1] = 0xff0000ff; + ptr[2] = 0xffff0000; + ptr[3] = 0xffff00ff; + hr = IDirect3DTexture8_UnlockRect(texture2, 0); + ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture1); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 1, (IDirect3DBaseTexture8 *)texture2); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX3); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_ADD); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_COLORARG2, D3DTA_CURRENT); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 2, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_TEXCOORDINDEX, 1); + ok(SUCCEEDED(hr), "Failed to set texcoord index, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_TEXCOORDINDEX, 0); + ok(SUCCEEDED(hr), "Failed to set texcoord index, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 1.0f, 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, sizeof(*quad)); + 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, 120); + ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 120); + ok(color_match(color, 0x0000ffff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00ff0000, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x00ffffff, 2), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2); + ok(SUCCEEDED(hr), "Failed to set texture transform flags, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_TEXTURE1, &mat); + ok(SUCCEEDED(hr), "Failed to set transformation matrix, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 1.0f, 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, sizeof(*quad)); + 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, 120); + ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 120); + ok(color_match(color, 0x0000ffff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00000000, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x0000ffff, 2), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE); + ok(SUCCEEDED(hr), "Failed to set texture transform flags, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_TEXCOORDINDEX, 2); + ok(SUCCEEDED(hr), "Failed to set texcoord index, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 1.0f, 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, sizeof(*quad)); + 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, 120); + ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 120); + ok(color_match(color, 0x0000ffff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00ff00ff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x00ffff00, 2), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + IDirect3DTexture8_Release(texture1); + IDirect3DTexture8_Release(texture2); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -6958,4 +7133,5 @@ START_TEST(visual) test_signed_formats(); test_pointsize(); test_multisample_mismatch(); + test_texcoordindex(); }

1 0

Matteo Bruni : d3d9/tests: Add a test for reordering texture coordinates via D3DTSS_TEXCOORDINDEX.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 81935797a10908333113ba8315cb9bcc82fca114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81935797a10908333113ba831… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 10 22:30:26 2015 +0200 d3d9/tests: Add a test for reordering texture coordinates via D3DTSS_TEXCOORDINDEX. --- dlls/d3d9/tests/visual.c | 176 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c4c1171..ae67d5c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -18772,6 +18772,181 @@ static void test_multisample_mismatch(void) DestroyWindow(window); } +static void test_texcoordindex(void) +{ + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + }}}; + static const struct + { + struct vec3 pos; + struct vec2 texcoord1; + struct vec2 texcoord2; + struct vec2 texcoord3; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f}, {0.0f, 0.0f}, {1.0f, 1.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 1.0f}, {1.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f}, {1.0f, 0.0f}, {0.0f, 1.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f}, {1.0f, 1.0f}, {0.0f, 0.0f}}, + }; + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + HWND window; + HRESULT hr; + IDirect3DTexture9 *texture1, *texture2; + D3DLOCKED_RECT locked_rect; + ULONG refcount; + D3DCOLOR color; + DWORD *ptr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture1, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture2, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = IDirect3DTexture9_LockRect(texture1, 0, &locked_rect, NULL, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); + ptr = locked_rect.pBits; + ptr[0] = 0xff000000; + ptr[1] = 0xff00ff00; + ptr[2] = 0xff0000ff; + ptr[3] = 0xff00ffff; + hr = IDirect3DTexture9_UnlockRect(texture1, 0); + ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); + + hr = IDirect3DTexture9_LockRect(texture2, 0, &locked_rect, NULL, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); + ptr = locked_rect.pBits; + ptr[0] = 0xff000000; + ptr[1] = 0xff0000ff; + ptr[2] = 0xffff0000; + ptr[3] = 0xffff00ff; + hr = IDirect3DTexture9_UnlockRect(texture2, 0); + ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture1); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 1, (IDirect3DBaseTexture9 *)texture2); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX3); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_ADD); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLORARG2, D3DTA_CURRENT); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 2, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXCOORDINDEX, 1); + ok(SUCCEEDED(hr), "Failed to set texcoord index, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_TEXCOORDINDEX, 0); + ok(SUCCEEDED(hr), "Failed to set texcoord index, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 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); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + 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, 120); + ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 120); + ok(color_match(color, 0x0000ffff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00ff0000, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x00ffffff, 2), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2); + ok(SUCCEEDED(hr), "Failed to set texture transform flags, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE1, &mat); + ok(SUCCEEDED(hr), "Failed to set transformation matrix, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 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); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + 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, 120); + ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 120); + ok(color_match(color, 0x0000ffff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00000000, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x0000ffff, 2), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE); + ok(SUCCEEDED(hr), "Failed to set texture transform flags, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_TEXCOORDINDEX, 2); + ok(SUCCEEDED(hr), "Failed to set texcoord index, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 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); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + 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, 120); + ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 120); + ok(color_match(color, 0x0000ffff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00ff00ff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x00ffff00, 2), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + IDirect3DTexture9_Release(texture1); + IDirect3DTexture9_Release(texture2); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -18886,4 +19061,5 @@ START_TEST(visual) test_table_fog_zw(); test_signed_formats(); test_multisample_mismatch(); + test_texcoordindex(); }

1 0

Huw Davies : shell32/tests: Fix failing test on Win 2k.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 905e7aad0e759371a4013c7ac65fa337ecfa17a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905e7aad0e759371a4013c7ac… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 11 11:18:55 2015 +0100 shell32/tests: Fix failing test on Win 2k. --- dlls/shell32/tests/shlview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index cab0630..6525dd2 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -661,7 +661,7 @@ if (0) hwnd_view = NULL; hr = IShellView_CreateViewWindow(view, NULL, &settings, &test_shellbrowser, &r, &hwnd_view); - ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(hr == S_OK || broken(hr == S_FALSE), "got (0x%08x)\n", hr); ok(hwnd_view != 0, "got %p\n", hwnd_view); hwnd2 = (HWND)0xdeadbeef;

1 0

Guillaume Charifi : xaudio2_7: Add XAudio2 class registration.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: cd906f08cd5d75b2dba9e2f18166f6fb90848c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd906f08cd5d75b2dba9e2f18… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Tue Jun 9 10:49:51 2015 +0200 xaudio2_7: Add XAudio2 class registration. --- configure | 2 +- configure.ac | 2 +- dlls/xaudio2_7/Makefile.in | 2 ++ dlls/xaudio2_7/xaudio_classes.idl | 28 ++++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/configure b/configure index fa52cf7..e51ee56 100755 --- a/configure +++ b/configure @@ -17732,7 +17732,7 @@ wine_fn_config_dll xapofx1_1 enable_xapofx1_1 wine_fn_config_dll xapofx1_3 enable_xapofx1_3 wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 -wine_fn_config_dll xaudio2_7 enable_xaudio2_7 +wine_fn_config_dll xaudio2_7 enable_xaudio2_7 clean wine_fn_config_dll xinput1_1 enable_xinput1_1 wine_fn_config_dll xinput1_2 enable_xinput1_2 wine_fn_config_dll xinput1_3 enable_xinput1_3 implib xinput diff --git a/configure.ac b/configure.ac index 79110c1..df28b27 100644 --- a/configure.ac +++ b/configure.ac @@ -3420,7 +3420,7 @@ WINE_CONFIG_DLL(xapofx1_1) WINE_CONFIG_DLL(xapofx1_3) WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) -WINE_CONFIG_DLL(xaudio2_7) +WINE_CONFIG_DLL(xaudio2_7,,[clean]) WINE_CONFIG_DLL(xinput1_1) WINE_CONFIG_DLL(xinput1_2) WINE_CONFIG_DLL(xinput1_3,,[implib],[xinput]) diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in index 853d1d6..6bdf362 100644 --- a/dlls/xaudio2_7/Makefile.in +++ b/dlls/xaudio2_7/Makefile.in @@ -3,3 +3,5 @@ IMPORTS = advapi32 kernel32 ole32 user32 uuid C_SRCS = \ xaudio_dll.c + +IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl new file mode 100644 index 0000000..79bc7a4 --- /dev/null +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -0,0 +1,28 @@ +/* + * COM Classes for xaudio + * + * Copyright 2015 Guillaume Charifi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +[ + helpstring("XAudio2 Class"), + threading(both), + uuid(5a508685-a254-4fba-9b82-9a24b00306af) +] +coclass XAudio2 { interface IXAudio2; }

1 0

Erich E. Hoover : kernel32: Implement GetSystemTimes.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 5e817e93dedad99741a0637e5952e6f18590c866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e817e93dedad99741a0637e5… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Tue Jun 9 21:38:08 2015 -0600 kernel32: Implement GetSystemTimes. --- dlls/kernel32/tests/time.c | 12 ++++----- dlls/kernel32/time.c | 62 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index febe366..838d79c 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -820,7 +820,7 @@ static void test_GetSystemTimes(void) return; } - todo_wine ok( pGetSystemTimes(NULL, NULL, NULL), "GetSystemTimes failed unexpectedly\n" ); + ok( pGetSystemTimes(NULL, NULL, NULL), "GetSystemTimes failed unexpectedly\n" ); total_usertime.QuadPart = 0; total_kerneltime.QuadPart = 0; @@ -828,8 +828,8 @@ static void test_GetSystemTimes(void) memset( &idletime, 0x11, sizeof(idletime) ); memset( &kerneltime, 0x11, sizeof(kerneltime) ); memset( &usertime, 0x11, sizeof(usertime) ); - todo_wine ok( pGetSystemTimes(&idletime, &kerneltime , &usertime), - "GetSystemTimes failed unexpectedly\n" ); + ok( pGetSystemTimes(&idletime, &kerneltime , &usertime), + "GetSystemTimes failed unexpectedly\n" ); ul1.LowPart = idletime.dwLowDateTime; ul1.HighPart = idletime.dwHighDateTime; @@ -861,9 +861,9 @@ static void test_GetSystemTimes(void) total_idletime.QuadPart += sppi[i].IdleTime.QuadPart; } - todo_wine ok( total_idletime.QuadPart - ul1.QuadPart < 10000000, "test idletime failed\n" ); - todo_wine ok( total_kerneltime.QuadPart - ul2.QuadPart < 10000000, "test kerneltime failed\n" ); - todo_wine ok( total_usertime.QuadPart - ul3.QuadPart < 10000000, "test usertime failed\n" ); + ok( total_idletime.QuadPart - ul1.QuadPart < 10000000, "test idletime failed\n" ); + ok( total_kerneltime.QuadPart - ul2.QuadPart < 10000000, "test kerneltime failed\n" ); + ok( total_usertime.QuadPart - ul3.QuadPart < 10000000, "test usertime failed\n" ); HeapFree(GetProcessHeap(), 0, sppi); } diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index daafc7f..7dcf71f 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1104,9 +1104,67 @@ BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate, */ BOOL WINAPI GetSystemTimes(LPFILETIME lpIdleTime, LPFILETIME lpKernelTime, LPFILETIME lpUserTime) { - FIXME("(%p,%p,%p): Stub!\n", lpIdleTime, lpKernelTime, lpUserTime); + LARGE_INTEGER idle_time, kernel_time, user_time; + SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *sppi; + SYSTEM_BASIC_INFORMATION sbi; + NTSTATUS status; + ULONG ret_size; + int i; - return FALSE; + TRACE("(%p,%p,%p)\n", lpIdleTime, lpKernelTime, lpUserTime); + + status = NtQuerySystemInformation( SystemBasicInformation, &sbi, sizeof(sbi), &ret_size ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + + sppi = HeapAlloc( GetProcessHeap(), 0, + sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * sbi.NumberOfProcessors); + if (!sppi) + { + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } + + status = NtQuerySystemInformation( SystemProcessorPerformanceInformation, sppi, sizeof(*sppi) * sbi.NumberOfProcessors, + &ret_size ); + if (status != STATUS_SUCCESS) + { + HeapFree( GetProcessHeap(), 0, sppi ); + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + + idle_time.QuadPart = 0; + kernel_time.QuadPart = 0; + user_time.QuadPart = 0; + for (i = 0; i < sbi.NumberOfProcessors; i++) + { + idle_time.QuadPart += sppi[i].IdleTime.QuadPart; + kernel_time.QuadPart += sppi[i].KernelTime.QuadPart; + user_time.QuadPart += sppi[i].UserTime.QuadPart; + } + + if (lpIdleTime) + { + lpIdleTime->dwLowDateTime = idle_time.u.LowPart; + lpIdleTime->dwHighDateTime = idle_time.u.HighPart; + } + if (lpKernelTime) + { + lpKernelTime->dwLowDateTime = kernel_time.u.LowPart; + lpKernelTime->dwHighDateTime = kernel_time.u.HighPart; + } + if (lpUserTime) + { + lpUserTime->dwLowDateTime = user_time.u.LowPart; + lpUserTime->dwHighDateTime = user_time.u.HighPart; + } + + HeapFree( GetProcessHeap(), 0, sppi ); + return TRUE; } /***********************************************************************

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::seekoff/seekpos.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 6b6dc42d61ae08bb445f93e3ea00b20cf46fe827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6dc42d61ae08bb445f93e3e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 9 19:40:40 2015 +0200 msvcirt: Add implementation of streambuf::seekoff/seekpos. --- dlls/msvcirt/msvcirt.c | 9 +++++---- dlls/msvcirt/msvcirt.h | 6 ++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index e20fb68..7a31699 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -354,9 +354,10 @@ int __thiscall streambuf_pbackfail(streambuf *this, int c) /* ?seekoff(a)streambuf@@UAEJJW4seek_dir(a)ios@@H(a)Z */ /* ?seekoff(a)streambuf@@UEAAJJW4seek_dir(a)ios@@H(a)Z */ DEFINE_THISCALL_WRAPPER(streambuf_seekoff, 16) -streampos __thiscall streambuf_seekoff(streambuf *this, streamoff offset, int dir, int mode) +#define call_streambuf_seekoff(this, off, dir, mode) CALL_VTBL_FUNC(this, 12, streampos, (streambuf*, streamoff, ios_seek_dir, int), (this, off, dir, mode)) +streampos __thiscall streambuf_seekoff(streambuf *this, streamoff offset, ios_seek_dir dir, int mode) { - FIXME("(%p %d %d %d): stub\n", this, offset, dir, mode); + TRACE("(%p %d %d %d)\n", this, offset, dir, mode); return EOF; } @@ -365,8 +366,8 @@ streampos __thiscall streambuf_seekoff(streambuf *this, streamoff offset, int di DEFINE_THISCALL_WRAPPER(streambuf_seekpos, 12) streampos __thiscall streambuf_seekpos(streambuf *this, streampos pos, int mode) { - FIXME("(%p %d %d): stub\n", this, pos, mode); - return EOF; + TRACE("(%p %d %d)\n", this, pos, mode); + return call_streambuf_seekoff(this, pos, SEEKDIR_beg, mode); } /* ?setb(a)streambuf@@IAEXPAD0H(a)Z */ diff --git a/dlls/msvcirt/msvcirt.h b/dlls/msvcirt/msvcirt.h index 5cf15de..4751e8c 100644 --- a/dlls/msvcirt/msvcirt.h +++ b/dlls/msvcirt/msvcirt.h @@ -23,6 +23,12 @@ typedef LONG streamoff; typedef LONG streampos; +typedef enum { + SEEKDIR_beg = 0, + SEEKDIR_cur = 1, + SEEKDIR_end = 2 +} ios_seek_dir; + extern void* (__cdecl *MSVCRT_operator_new)(SIZE_T); extern void (__cdecl *MSVCRT_operator_delete)(void*);

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::sync.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 1f1cf8a68e38c68fbdfbcaaf60d89930fff2dbef URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1cf8a68e38c68fbdfbcaaf6… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 9 19:40:33 2015 +0200 msvcirt: Add implementation of streambuf::sync. --- dlls/msvcirt/msvcirt.c | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index a5b7141..e20fb68 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -437,8 +437,8 @@ void __thiscall streambuf_setp(streambuf *this, char *pb, char *ep) DEFINE_THISCALL_WRAPPER(streambuf_sync, 4) int __thiscall streambuf_sync(streambuf *this) { - FIXME("(%p): stub\n", this); - return EOF; + TRACE("(%p)\n", this); + return (this->gptr == this->egptr && this->pbase == this->pptr) ? 0 : EOF; } /* ?unbuffered(a)streambuf@@IAEXH(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 2a45b04..057c6c8 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -61,6 +61,7 @@ static void (*__thiscall p_streambuf_pbump)(streambuf*, int); static void (*__thiscall p_streambuf_setb)(streambuf*, char*, char*, int); static void (*__thiscall p_streambuf_setlock)(streambuf*); static streambuf* (*__thiscall p_streambuf_setbuf)(streambuf*, char*, int); +static int (*__thiscall p_streambuf_sync)(streambuf*); static void (*__thiscall p_streambuf_unlock)(streambuf*); /* Emulate a __thiscall */ @@ -144,6 +145,7 @@ static BOOL init(void) SET(p_streambuf_setb, "?setb(a)streambuf@@IEAAXPEAD0H(a)Z"); SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UEAAPEAV1(a)PEADH@Z"); SET(p_streambuf_setlock, "?setlock(a)streambuf@@QEAAXXZ"); + SET(p_streambuf_sync, "?sync(a)streambuf@@UEAAHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QEAAXXZ"); } else { SET(p_streambuf_reserve_ctor, "??0streambuf@@IAE(a)PADH@Z"); @@ -158,6 +160,7 @@ static BOOL init(void) SET(p_streambuf_setb, "?setb(a)streambuf@@IAEXPAD0H(a)Z"); SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UAEPAV1(a)PADH@Z"); SET(p_streambuf_setlock, "?setlock(a)streambuf@@QAEXXZ"); + SET(p_streambuf_sync, "?sync(a)streambuf@@UAEHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QAEXXZ"); } @@ -341,6 +344,18 @@ static void test_streambuf(void) call_func2(p_streambuf_pbump, &sb, 20); ok(sb.pptr == sb.pbase + 18, "advance put pointer failed, expected %p got %p\n", sb.pbase + 18, sb.pptr); + /* sync */ + ret = (int) call_func1(p_streambuf_sync, &sb); + ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); + sb.gptr = sb.egptr; + ret = (int) call_func1(p_streambuf_sync, &sb); + ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); + sb.pptr = sb.pbase; + ret = (int) call_func1(p_streambuf_sync, &sb); + ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + ret = (int) call_func1(p_streambuf_sync, &sb2); + ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE);

1 0

Michael Stefaniuc : dmstyle: Use the generic DirectMusicObject implementation for DMStyle.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 3ebf41cc425570efc588a4783726a14f77fe8275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ebf41cc425570efc588a4783… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 10 23:48:15 2015 +0200 dmstyle: Use the generic DirectMusicObject implementation for DMStyle. --- dlls/dmstyle/Makefile.in | 1 + dlls/dmstyle/dmobject.c | 185 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmstyle/dmobject.h | 55 ++++++++++++++ dlls/dmstyle/style.c | 171 ++++++++++--------------------------------- 4 files changed, 281 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ebf41cc425570efc588a…

1 0