May 2013 - Wine-Commits - list.winehq.org

Kyle Luna : wined3d: Add Mobility Radeon HD 4200.
by Alexandre Julliard May 31, 2013

May 31, 2013

Module: wine Branch: master Commit: 7f5f166a19c4ddd690a2b7eb792a613f58ad7a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5f166a19c4ddd690a2b7eb7… Author: Kyle Luna <kyl416(a)aol.com> Date: Thu May 30 17:51:10 2013 -0400 wined3d: Add Mobility Radeon HD 4200. --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d308322..d2fd22c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1177,6 +1177,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD2600, "ATI Mobility Radeon HD 2600", DRIVER_AMD_R600, 256 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD2900, "ATI Radeon HD 2900 XT", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD3200, "ATI Radeon HD 3200 Graphics", DRIVER_AMD_R600, 128 }, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4200M, "ATI Mobility Radeon HD 4200", DRIVER_AMD_R600, 256 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4350, "ATI Radeon HD 4350", DRIVER_AMD_R600, 256 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4600, "ATI Radeon HD 4600 Series", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4700, "ATI Radeon HD 4700 Series", DRIVER_AMD_R600, 512 }, @@ -1812,6 +1813,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in {"HD 4550", CARD_AMD_RADEON_HD4350}, /* Radeon RV710 */ {"HD 4350", CARD_AMD_RADEON_HD4350}, /* Radeon RV710 */ /* R600/R700 integrated */ + {"HD 4200M", CARD_AMD_RADEON_HD4200M}, {"HD 3300", CARD_AMD_RADEON_HD3200}, {"HD 3200", CARD_AMD_RADEON_HD3200}, {"HD 3100", CARD_AMD_RADEON_HD3200}, @@ -1987,7 +1989,7 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info {"RV730", CARD_AMD_RADEON_HD4600}, {"RV710", CARD_AMD_RADEON_HD4350}, /* R600/R700 integrated */ - {"RS880", CARD_AMD_RADEON_HD3200}, + {"RS880", CARD_AMD_RADEON_HD4200M}, {"RS780", CARD_AMD_RADEON_HD3200}, /* R600 */ {"R680", CARD_AMD_RADEON_HD2900}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84adc27..7c088eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1364,6 +1364,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD2600 = 0x9581, CARD_AMD_RADEON_HD2900 = 0x9400, CARD_AMD_RADEON_HD3200 = 0x9620, + CARD_AMD_RADEON_HD4200M = 0x9712, CARD_AMD_RADEON_HD4350 = 0x954f, CARD_AMD_RADEON_HD4600 = 0x9495, CARD_AMD_RADEON_HD4700 = 0x944e,

1 0

Andrew Eikum : dsound/tests: Fix test that fails on older Windows 2000.
by Alexandre Julliard May 31, 2013

May 31, 2013

Module: wine Branch: master Commit: 892068f96ca895731dd2ed5f070c21c711b8eff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892068f96ca895731dd2ed5f0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 31 10:27:38 2013 -0500 dsound/tests: Fix test that fails on older Windows 2000. --- dlls/dsound/tests/dsound.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index bca0d76..d31dc9c 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1409,6 +1409,11 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) ok(wfx.nBlockAlign == 4, "blockalign: %u\n", wfx.nBlockAlign); ok(wfx.nAvgBytesPerSec == 44100 * 4, "avgbytes: %u\n", wfx.nAvgBytesPerSec); + if(!gotdx8){ + win_skip("Not doing the WAVE_FORMAT_EXTENSIBLE tests\n"); + goto done; + } + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; fmtex.Format.nChannels = 2; @@ -1475,6 +1480,7 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) IDirectSoundBuffer_Release(primary); } +done: IDirectSound_Release(dso); return S_OK;

1 0

Matteo Bruni : winex11.drv: Fix wglCreateContextAttribsARB' s attributes handling for real.
by Alexandre Julliard May 31, 2013

May 31, 2013

Module: wine Branch: master Commit: 667bd327bec7edf9a8958358d342bf75683ed3f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=667bd327bec7edf9a8958358d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 31 14:52:21 2013 +0200 winex11.drv: Fix wglCreateContextAttribsARB's attributes handling for real. --- dlls/winex11.drv/opengl.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 05b8f60..cd24575 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1945,7 +1945,6 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg ret->fmt = gl->format; ret->vis = NULL; /* glXCreateContextAttribsARB requires a fbconfig instead of a visual */ ret->gl3_context = TRUE; - ret->numAttribs = 0; if (attribList) { int *pContextAttribList = &ret->attribList[0]; @@ -1959,11 +1958,13 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg pContextAttribList[0] = GLX_CONTEXT_MAJOR_VERSION_ARB; pContextAttribList[1] = attribList[1]; pContextAttribList += 2; + ret->numAttribs++; break; case WGL_CONTEXT_MINOR_VERSION_ARB: pContextAttribList[0] = GLX_CONTEXT_MINOR_VERSION_ARB; pContextAttribList[1] = attribList[1]; pContextAttribList += 2; + ret->numAttribs++; break; case WGL_CONTEXT_LAYER_PLANE_ARB: break; @@ -1971,16 +1972,17 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg pContextAttribList[0] = GLX_CONTEXT_FLAGS_ARB; pContextAttribList[1] = attribList[1]; pContextAttribList += 2; + ret->numAttribs++; break; case WGL_CONTEXT_PROFILE_MASK_ARB: pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB; pContextAttribList[1] = attribList[1]; pContextAttribList += 2; + ret->numAttribs++; break; default: ERR("Unhandled attribList pair: %#x %#x\n", attribList[0], attribList[1]); } - ret->numAttribs++; attribList += 2; } }

1 0

Hans Leidekker : rpcrt4: Specify INTERNET_FLAG_NO_CACHE_WRITE for the HTTP transport pipes.
by Alexandre Julliard May 31, 2013

May 31, 2013

Module: wine Branch: master Commit: 30c00ea16d3f2bfc51d8dc67459d12b4fb831339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c00ea16d3f2bfc51d8dc674… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 31 16:04:15 2013 +0200 rpcrt4: Specify INTERNET_FLAG_NO_CACHE_WRITE for the HTTP transport pipes. --- dlls/rpcrt4/rpc_transport.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 6adc289..921c43d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2364,6 +2364,7 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) static const WCHAR wszColon[] = {':',0}; static const WCHAR wszAcceptType[] = {'a','p','p','l','i','c','a','t','i','o','n','/','r','p','c',0}; LPCWSTR wszAcceptTypes[] = { wszAcceptType, NULL }; + DWORD flags; WCHAR *url; RPC_STATUS status; BOOL secure; @@ -2403,20 +2404,19 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) && (httpc->common.QOS->qos->u.HttpCredentials->Flags & RPC_C_HTTP_FLAG_USE_SSL); - httpc->in_request = HttpOpenRequestW(httpc->session, wszVerbIn, url, NULL, NULL, - wszAcceptTypes, - (secure ? INTERNET_FLAG_SECURE : 0)|INTERNET_FLAG_KEEP_CONNECTION|INTERNET_FLAG_PRAGMA_NOCACHE, - (DWORD_PTR)httpc->async_data); + flags = INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_NO_CACHE_WRITE; + if (secure) flags |= INTERNET_FLAG_SECURE; + + httpc->in_request = HttpOpenRequestW(httpc->session, wszVerbIn, url, NULL, NULL, wszAcceptTypes, + flags, (DWORD_PTR)httpc->async_data); if (!httpc->in_request) { ERR("HttpOpenRequestW failed with error %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, url); return RPC_S_SERVER_UNAVAILABLE; } - httpc->out_request = HttpOpenRequestW(httpc->session, wszVerbOut, url, NULL, NULL, - wszAcceptTypes, - (secure ? INTERNET_FLAG_SECURE : 0)|INTERNET_FLAG_KEEP_CONNECTION|INTERNET_FLAG_PRAGMA_NOCACHE, - (DWORD_PTR)httpc->async_data); + httpc->out_request = HttpOpenRequestW(httpc->session, wszVerbOut, url, NULL, NULL, wszAcceptTypes, + flags, (DWORD_PTR)httpc->async_data); HeapFree(GetProcessHeap(), 0, url); if (!httpc->out_request) {

1 0

Nikolay Sivov : xmllite: Set PI target value just after it's parsed.
by Alexandre Julliard May 31, 2013

May 31, 2013

Module: wine Branch: master Commit: caa452e958b883133d0378d5be2e82249a55ccb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa452e958b883133d0378d5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 19:27:31 2013 +0400 xmllite: Set PI target value just after it's parsed. --- dlls/xmllite/reader.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ed4f97e..8276b85 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1300,6 +1300,9 @@ static HRESULT reader_parse_pi(xmlreader *reader) case XmlReadResumeState_PITarget: hr = reader_parse_pitarget(reader, &target); if (FAILED(hr)) return hr; + reader_set_strvalue(reader, StringValue_LocalName, &target); + reader_set_strvalue(reader, StringValue_QualifiedName, &target); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); reader->resumestate = XmlReadResumeState_PIBody; default: ; @@ -1313,9 +1316,6 @@ static HRESULT reader_parse_pi(xmlreader *reader) reader_skipn(reader, 2); reader->nodetype = XmlNodeType_ProcessingInstruction; reader->resumestate = XmlReadResumeState_Initial; - reader_set_strvalue(reader, StringValue_LocalName, &target); - reader_set_strvalue(reader, StringValue_QualifiedName, &target); - reader_set_strvalue(reader, StringValue_Value, &strval_empty); return S_OK; } @@ -1348,8 +1348,6 @@ static HRESULT reader_parse_pi(xmlreader *reader) reader->resumestate = XmlReadResumeState_Initial; reader->resume[XmlReadResume_Body] = NULL; reader_init_strvalue(start, ptr-start, &value); - reader_set_strvalue(reader, StringValue_LocalName, &target); - reader_set_strvalue(reader, StringValue_QualifiedName, &target); reader_set_strvalue(reader, StringValue_Value, &value); return S_OK; }

1 0

Andrew Eikum : winmm/tests: Fix test that fails on NT4.
by Alexandre Julliard May 31, 2013

May 31, 2013

Module: wine Branch: master Commit: d4560b0ce02f62ce14d6495f72fb0bcc85e439f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4560b0ce02f62ce14d6495f7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 31 10:42:37 2013 -0500 winmm/tests: Fix test that fails on NT4. --- dlls/winmm/tests/capture.c | 6 ++++-- dlls/winmm/tests/wave.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 329130a..f904bb1 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -649,10 +649,12 @@ static void wave_in_tests(void) rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&preferred, (DWORD_PTR)&status); ok((ndev == 0 && (rc == MMSYSERR_NODRIVER || rc == MMSYSERR_BADDEVICEID)) || + rc == MMSYSERR_NOTSUPPORTED || rc == MMSYSERR_NOERROR, "waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); - ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || - preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); + if(rc != MMSYSERR_NOTSUPPORTED) + ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || + preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); rc=waveInGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID, diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index fd05f7b..171bf49 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1420,10 +1420,12 @@ static void wave_out_tests(void) rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&preferred, (DWORD_PTR)&status); ok((ndev == 0 && (rc == MMSYSERR_NODRIVER || rc == MMSYSERR_BADDEVICEID)) || + rc == MMSYSERR_NOTSUPPORTED || rc == MMSYSERR_NOERROR, "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); - ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || - preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); + if(rc != MMSYSERR_NOTSUPPORTED) + ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || + preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); rc=waveOutGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID,

1 0

Nikolay Sivov : msxml3: Properly trace variant value.
by Alexandre Julliard May 31, 2013

May 31, 2013

Module: wine Branch: master Commit: facc14ead9493022516a6c7f1919dfe3cd2af873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=facc14ead9493022516a6c7f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 06:59:32 2013 +0400 msxml3: Properly trace variant value. --- dlls/msxml3/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 4c7237a..7eae2d4 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2997,7 +2997,7 @@ static HRESULT WINAPI domdoc_setProperty( lstrcmpiW(p, PropertyResolveExternalsW) == 0) { /* Ignore */ - FIXME("Ignoring property %s, value %d\n", debugstr_w(p), V_BOOL(&value)); + FIXME("Ignoring property %s, value %s\n", debugstr_w(p), debugstr_variant(&value)); return S_OK; }

1 0

Vincent Povirk : gdiplus: Add test for measuring a single line that exactly fits.
by Alexandre Julliard May 31, 2013

May 31, 2013

Module: wine Branch: master Commit: e21af554b5602af5497c28ed336b42964cef6204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21af554b5602af5497c28ed3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 30 14:47:13 2013 -0500 gdiplus: Add test for measuring a single line that exactly fits. --- dlls/gdiplus/tests/graphics.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index cbe0b9d..5de0602 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3042,6 +3042,23 @@ static void test_string_functions(void) expect(2, linesfilled); char_height = bounds.Height - char_bounds.Height; + /* Measure the first line. */ + status = GdipMeasureString(graphics, teststring, 4, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expect(4, codepointsfitted); + expect(1, linesfilled); + + /* Give just enough space to fit the first line. */ + rc.Width = bounds.Width; + status = GdipMeasureString(graphics, teststring, 5, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + todo_wine expect(5, codepointsfitted); + todo_wine expect(1, linesfilled); + /* Cut off everything after the first space. */ rc.Width = char_bounds.Width + char_width * 2.1;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMANIMATIONSET.
by Alexandre Julliard May 31, 2013

May 31, 2013

Module: wine Branch: master Commit: 78afa17fbe95a77c5dad9c0a9f4860716f885006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78afa17fbe95a77c5dad9c0a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 30 22:34:18 2013 +0200 d3drm: Avoid LPDIRECT3DRMANIMATIONSET. --- dlls/d3drm/d3drm.c | 13 ++++--------- include/d3drm.h | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 07b4a46..de6945b 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -175,11 +175,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateAnimation(IDirect3DRM *iface, IDirec return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_CreateAnimationSet(IDirect3DRM* iface, LPDIRECT3DRMANIMATIONSET * ppAnimationSet) +static HRESULT WINAPI IDirect3DRMImpl_CreateAnimationSet(IDirect3DRM *iface, IDirect3DRMAnimationSet **set) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppAnimationSet); + FIXME("iface %p, set %p stub!\n", iface, set); return E_NOTIMPL; } @@ -549,12 +547,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimation(IDirect3DRM2 *iface, IDir return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimationSet(IDirect3DRM2* iface, - LPDIRECT3DRMANIMATIONSET * ppAnimationSet) +static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimationSet(IDirect3DRM2 *iface, IDirect3DRMAnimationSet **set) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppAnimationSet); + FIXME("iface %p, set %p stub!\n", iface, set); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index b3b120e..e33a67b 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -63,7 +63,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE; STDMETHOD(CreateAnimation)(THIS_ IDirect3DRMAnimation **animation) PURE; - STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; + STDMETHOD(CreateAnimationSet)(THIS_ IDirect3DRMAnimationSet **set) PURE; STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE type, D3DCOLOR color, IDirect3DRMLight **light) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE type, D3DVALUE r, D3DVALUE g, D3DVALUE b, @@ -202,7 +202,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder2 **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE; STDMETHOD(CreateAnimation)(THIS_ IDirect3DRMAnimation **animation) PURE; - STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; + STDMETHOD(CreateAnimationSet)(THIS_ IDirect3DRMAnimationSet **set) PURE; STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE type, D3DCOLOR color, IDirect3DRMLight **light) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE type, D3DVALUE r, D3DVALUE g, D3DVALUE b,

1 0

Henri Verbeet : d3d10core/tests: Add a small test for ID3D10Device_CreatePredicate().
by Alexandre Julliard May 31, 2013

May 31, 2013

Module: wine Branch: master Commit: c97c51120cd0a419527c7438df222e614eb09187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c97c51120cd0a419527c7438d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 30 22:34:17 2013 +0200 d3d10core/tests: Add a small test for ID3D10Device_CreatePredicate(). --- dlls/d3d10core/tests/device.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 1ed99a0..63b65bc 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -762,6 +762,42 @@ static void test_create_rasterizer_state(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_predicate(void) +{ + D3D10_QUERY_DESC query_desc; + ID3D10Predicate *predicate; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_CreatePredicate(device, NULL, &predicate); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + query_desc.Query = D3D10_QUERY_OCCLUSION; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + query_desc.Query = D3D10_QUERY_OCCLUSION_PREDICATE; + hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate); + ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); + ID3D10Predicate_Release(predicate); + + query_desc.Query = D3D10_QUERY_SO_OVERFLOW_PREDICATE; + hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate); + ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); + ID3D10Predicate_Release(predicate); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_device_interfaces(); @@ -775,4 +811,5 @@ START_TEST(device) test_create_blend_state(); test_create_depthstencil_state(); test_create_rasterizer_state(); + test_create_predicate(); }

1 0