September 2013 - Wine-Commits

Nikolay Sivov : kernel32/tests: Some tests for ' comInterfaceExternalProxyStub' data.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 3c0b7ba0297a9afaadec8d4071d7c2402d868c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c0b7ba0297a9afaadec8d407… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 30 11:20:10 2013 +0400 kernel32/tests: Some tests for 'comInterfaceExternalProxyStub' data. --- dlls/kernel32/tests/actctx.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 39c105a..059ce44 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -91,6 +91,8 @@ DEFINE_GUID(IID_TlibTest3, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0 DEFINE_GUID(IID_TlibTest4, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x58); DEFINE_GUID(IID_Iifaceps, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); DEFINE_GUID(IID_Ibifaceps, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57); +DEFINE_GUID(IID_Iifaceps2, 0x76666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); +DEFINE_GUID(IID_PS32, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x56); static const char manifest3[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" @@ -119,6 +121,14 @@ static const char manifest3[] = " baseInterface=\"{66666666-8888-7777-6666-555555555557}\"" " />" "</file>" +" <comInterfaceExternalProxyStub " +" name=\"Iifaceps2\"" +" tlbid=\"{99999999-8888-7777-6666-555555555558}\"" +" iid=\"{76666666-8888-7777-6666-555555555555}\"" +" proxyStubClsid32=\"{66666666-8888-7777-6666-555555555556}\"" +" numMethods=\"10\"" +" baseInterface=\"{66666666-8888-7777-6666-555555555557}\"" +" />" "</assembly>"; static const char manifest_wndcls1[] = @@ -1232,7 +1242,8 @@ struct ifacepsredirect_data ULONG name_offset; }; -static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const GUID *tlbid, const GUID *base, ULONG exid, int line) +static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const GUID *tlbid, const GUID *base, + const GUID *ps32, ULONG exid, int line) { struct ifacepsredirect_data *ifaceps; ACTCTX_SECTION_KEYED_DATA data; @@ -1262,7 +1273,14 @@ todo_wine { ULONG len; - ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, iid), "got wrong iid %s\n", debugstr_guid(&ifaceps->iid)); + /* for external proxy stubs it contains a value from 'proxyStubClsid32' */ + if (ps32) + { + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, ps32), "got wrong iid %s\n", debugstr_guid(&ifaceps->iid)); + } + else + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, iid), "got wrong iid %s\n", debugstr_guid(&ifaceps->iid)); + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->tlbid, tlbid), "got wrong tlid %s\n", debugstr_guid(&ifaceps->tlbid)); ok_(__FILE__, line)(ifaceps->name_len > 0, "got modulename len %d\n", ifaceps->name_len); ok_(__FILE__, line)(ifaceps->name_offset == ifaceps->size, "got progid offset %d\n", ifaceps->name_offset); @@ -1609,7 +1627,8 @@ static void test_actctx(void) test_find_dll_redirection(handle, testlib_dll, 1, __LINE__); test_find_dll_redirection(handle, testlib_dll, 1, __LINE__); test_find_com_redirection(handle, &IID_CoTest, &IID_TlibTest, 1, __LINE__); - test_find_ifaceps_redirection(handle, &IID_Iifaceps, &IID_TlibTest4, &IID_Ibifaceps, 1, __LINE__); + test_find_ifaceps_redirection(handle, &IID_Iifaceps, &IID_TlibTest4, &IID_Ibifaceps, NULL, 1, __LINE__); + test_find_ifaceps_redirection(handle, &IID_Iifaceps2, &IID_TlibTest4, &IID_Ibifaceps, &IID_PS32, 1, __LINE__); test_find_string_fail(); b = pDeactivateActCtx(0, cookie); ok(b, "DeactivateActCtx failed: %u\n", GetLastError());

1 0

Henri Verbeet : wined3d: Move the MAXLOCKCOUNT constant to surface.c.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 2d2391318689831123c5ed49c2eae429413e974d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2391318689831123c5ed49c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 2 09:45:40 2013 +0200 wined3d: Move the MAXLOCKCOUNT constant to surface.c. --- dlls/wined3d/surface.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 66f15fb..970985d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d); +#define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy. */ + static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2f8c6b2..688671d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2207,7 +2207,6 @@ struct wined3d_surface RECT lockedRect; RECT dirtyRect; int lockCount; -#define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy */ /* For GetDC */ struct wined3d_surface_dib dib;

1 0

Henri Verbeet : wined3d: Get rid of some leftover comments referring to the GL lock.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: b5e0c5d0529dd955b25c9ff2e0d3faef8cc096d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5e0c5d0529dd955b25c9ff2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 2 09:45:41 2013 +0200 wined3d: Get rid of some leftover comments referring to the GL lock. --- dlls/wined3d/arb_program_shader.c | 2 -- dlls/wined3d/buffer.c | 3 --- dlls/wined3d/context.c | 5 ----- dlls/wined3d/device.c | 10 ---------- dlls/wined3d/directx.c | 3 --- dlls/wined3d/nvidia_texture_shader.c | 1 - dlls/wined3d/shader.c | 1 - dlls/wined3d/state.c | 23 +++++++++++------------ dlls/wined3d/surface.c | 11 ----------- dlls/wined3d/swapchain.c | 5 ----- dlls/wined3d/texture.c | 6 ------ dlls/wined3d/volume.c | 2 -- dlls/wined3d/wined3d_main.c | 1 - 13 files changed, 11 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5e0c5d0529dd955b25c9…

1 0

Marcus Meissner : kernel32/tests: Avoid leaving com handle open (Coverity).
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: b084d7a4f8ff8b05b230271f76dd9c0c1f871b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b084d7a4f8ff8b05b230271f7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 31 10:16:48 2013 +0200 kernel32/tests: Avoid leaving com handle open (Coverity). --- dlls/kernel32/tests/comm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index e5264c8..6970cf9 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1036,7 +1036,7 @@ static void test_LoopbackCtsRts(void) if (dcb.fRtsControl == RTS_CONTROL_HANDSHAKE) { trace("RTS_CONTROL_HANDSHAKE is set, so don't manipulate RTS\n"); - CloseHandle(hcom); + CloseHandle(hcom); return; } ok(GetCommModemStatus(hcom, &defaultStat), "GetCommModemStatus failed\n"); @@ -1180,6 +1180,7 @@ static void test_LoopbackDtrRing(void) if (dcb.fDtrControl == DTR_CONTROL_HANDSHAKE) { trace("DTR_CONTROL_HANDSHAKE is set, so don't manipulate DTR\n"); + CloseHandle(hcom); return; } ok(GetCommModemStatus(hcom, &defaultStat), "GetCommModemStatus failed\n"); @@ -1592,6 +1593,7 @@ static void test_WaitRing(void) ok((ret = GetCommModemStatus(hcom, &defaultStat)), "GetCommModemStatus failed\n"); if (!ret) { skip("modem status failed -> skip.\n"); + CloseHandle(hcom); return; } if(defaultStat & MS_RING_ON) @@ -1668,7 +1670,7 @@ static void test_WaitDcd(void) if (dcb.fDtrControl == DTR_CONTROL_DISABLE) { trace("DTR_CONTROL_HANDSHAKE is set, so don't manipulate DTR\n"); - CloseHandle(hcom); + CloseHandle(hcom); return; } args[0]= TIMEOUT >>1;

1 0

Jacek Caban : crypt32: Get rid of PCertificateChainEngine typedef.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: f4ef543f8aaa1f2ba5c5bd725f643333b55d6c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ef543f8aaa1f2ba5c5bd725… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 2 14:35:45 2013 +0200 crypt32: Get rid of PCertificateChainEngine typedef. --- dlls/crypt32/chain.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d112673..b2bee4b 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -49,7 +49,7 @@ typedef struct _CertificateChainEngine DWORD dwUrlRetrievalTimeout; DWORD MaximumCachedCertificates; DWORD CycleDetectionModulus; -} CertificateChainEngine, *PCertificateChainEngine; +} CertificateChainEngine; static inline void CRYPT_AddStoresToCollection(HCERTSTORE collection, DWORD cStores, HCERTSTORE *stores) @@ -120,7 +120,7 @@ HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, static const WCHAR caW[] = { 'C','A',0 }; static const WCHAR myW[] = { 'M','y',0 }; static const WCHAR trustW[] = { 'T','r','u','s','t',0 }; - PCertificateChainEngine engine = + CertificateChainEngine *engine = CryptMemAlloc(sizeof(CertificateChainEngine)); if (engine) @@ -208,7 +208,7 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, VOID WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine) { - PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; + CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; TRACE("(%p)\n", hChainEngine); @@ -566,7 +566,7 @@ static BOOL CRYPT_DecodeBasicConstraints(PCCERT_CONTEXT cert, * Returns TRUE if the element can be a CA, and the length of the remaining * chain is valid. */ -static BOOL CRYPT_CheckBasicConstraintsForCA(PCertificateChainEngine engine, +static BOOL CRYPT_CheckBasicConstraintsForCA(CertificateChainEngine *engine, PCCERT_CONTEXT cert, CERT_BASIC_CONSTRAINTS2_INFO *chainConstraints, DWORD remainingCAs, BOOL isRoot, BOOL *pathLengthConstraintViolated) { @@ -1712,7 +1712,7 @@ static void dump_element(PCCERT_CONTEXT cert) dump_extension(&cert->pCertInfo->rgExtension[i]); } -static BOOL CRYPT_KeyUsageValid(PCertificateChainEngine engine, +static BOOL CRYPT_KeyUsageValid(CertificateChainEngine *engine, PCCERT_CONTEXT cert, BOOL isRoot, BOOL isCA, DWORD index) { PCERT_EXTENSION ext; @@ -1868,7 +1868,7 @@ static BOOL CRYPT_IsCertVersionValid(PCCERT_CONTEXT cert) return ret; } -static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, +static void CRYPT_CheckSimpleChain(CertificateChainEngine *engine, PCERT_SIMPLE_CHAIN chain, LPFILETIME time) { PCERT_CHAIN_ELEMENT rootElement = chain->rgpElement[chain->cElement - 1]; @@ -2140,7 +2140,7 @@ static LPCSTR debugstr_filetime(LPFILETIME pTime) return wine_dbg_sprintf("%p (%s)", pTime, filetime_to_str(pTime)); } -static BOOL CRYPT_GetSimpleChainForCert(PCertificateChainEngine engine, +static BOOL CRYPT_GetSimpleChainForCert(CertificateChainEngine *engine, HCERTSTORE world, PCCERT_CONTEXT cert, LPFILETIME pTime, PCERT_SIMPLE_CHAIN *ppChain) { @@ -2175,7 +2175,7 @@ static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine, PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore, PCertificateChain *ppChain) { - PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; + CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; PCERT_SIMPLE_CHAIN simpleChain = NULL; HCERTSTORE world; BOOL ret; @@ -2365,7 +2365,7 @@ static PCertificateChain CRYPT_BuildAlternateContextFromChain( HCERTCHAINENGINE hChainEngine, LPFILETIME pTime, HCERTSTORE hAdditionalStore, PCertificateChain chain) { - PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; + CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; PCertificateChain alternate; TRACE("(%p, %s, %p, %p)\n", hChainEngine, debugstr_filetime(pTime),

1 0

Marcus Meissner : rpcrt4: Free url in error paths (Coverity).
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: d138a1e43dab10e5a77aee2499583545e83e41fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d138a1e43dab10e5a77aee249… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 31 10:56:52 2013 +0200 rpcrt4: Free url in error paths (Coverity). --- dlls/rpcrt4/rpc_transport.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 8932f10..c004f66 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2533,12 +2533,16 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) return RPC_S_SERVER_UNAVAILABLE; } status = insert_authorization_header(httpc->in_request, httpc->common.QOS); - if (status != RPC_S_OK) + if (status != RPC_S_OK) { + HeapFree(GetProcessHeap(), 0, url); return status; + } status = insert_cookie_header(httpc->in_request, Connection->CookieAuth); - if (status != RPC_S_OK) + if (status != RPC_S_OK) { + HeapFree(GetProcessHeap(), 0, url); return status; + } httpc->out_request = HttpOpenRequestW(httpc->session, wszVerbOut, url, NULL, NULL, wszAcceptTypes, flags, (DWORD_PTR)httpc->async_data);

1 0

Stefan Dösinger : d3d8/tests: Add a DXT5 volume test.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 6c1007db1e7913d9187c3067061847676356d967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1007db1e7913d9187c30670… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 2 11:22:33 2013 +0200 d3d8/tests: Add a DXT5 volume test. --- dlls/d3d8/tests/visual.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 1436122..e13e1c6 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -3389,6 +3389,102 @@ static void fog_special_test(IDirect3DDevice8 *device) IDirect3DDevice8_DeletePixelShader(device, ps); } +static void volume_dxt5_test(IDirect3DDevice8 *device) +{ + HRESULT hr; + IDirect3D8 *d3d8; + IDirect3DVolumeTexture8 *texture; + D3DLOCKED_BOX box; + unsigned int i; + DWORD color; + static const char texture_data[] = + { + /* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */ + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 + }; + static const struct + { + struct vec3 position; + struct vec3 texcrd; + } + quads[] = + { + {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, + {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, + + {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, + {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, + }; + static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff}; + + hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); + ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5); + IDirect3D8_Release(d3d8); + if (FAILED(hr)) + { + skip("Volume dxt5 textures are not supported, skipping test.\n"); + return; + } + + hr = IDirect3DDevice8_CreateVolumeTexture(device, 8, 4, 2, 1, 0, D3DFMT_DXT5, + D3DPOOL_MANAGED, &texture); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + memcpy(box.pBits, texture_data, sizeof(texture_data)); + hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture); + ok(SUCCEEDED(hr), "Failed to set texture, 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_DISABLE); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAGFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.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, &quads[0], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); + 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_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + for (i = 0; i < 4; i++) + { + color = getPixelColor(device, 80 + 160 * i, 240); + ok (color_match(color, expected_colors[i], 1), + "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); + } + + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + IDirect3DVolumeTexture8_Release(texture); +} + START_TEST(visual) { IDirect3DDevice8 *device_ptr; @@ -3473,6 +3569,7 @@ START_TEST(visual) zenable_test(device_ptr); resz_test(device_ptr); fog_special_test(device_ptr); + volume_dxt5_test(device_ptr); cleanup: if(device_ptr) {

1 0

Stefan Dösinger : d3d9/tests: Add a DXT5 volume test.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 0cb72cdeb5ed0d530592f80180075fb450766ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb72cdeb5ed0d530592f8018… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 2 11:22:32 2013 +0200 d3d9/tests: Add a DXT5 volume test. --- dlls/d3d9/tests/visual.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index aeb6faf..b856c93 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14549,6 +14549,102 @@ static void volume_srgb_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Failed to set srgb state, hr %#x.\n", hr); } +static void volume_dxt5_test(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3D9 *d3d9; + IDirect3DVolumeTexture9 *texture; + D3DLOCKED_BOX box; + unsigned int i; + DWORD color; + static const char texture_data[] = + { + /* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */ + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 + }; + static const struct + { + struct vec3 position; + struct vec3 texcrd; + } + quads[] = + { + {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, + {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, + + {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, + {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, + }; + static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff}; + + hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); + ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5); + IDirect3D9_Release(d3d9); + if (FAILED(hr)) + { + skip("Volume dxt5 textures are not supported, skipping test.\n"); + return; + } + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 8, 4, 2, 1, 0, D3DFMT_DXT5, + D3DPOOL_MANAGED, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + memcpy(box.pBits, texture_data, sizeof(texture_data)); + hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(SUCCEEDED(hr), "Failed to set texture, 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_DISABLE); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.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, &quads[0], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); + 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_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + for (i = 0; i < 4; i++) + { + color = getPixelColor(device, 80 + 160 * i, 240); + ok (color_match(color, expected_colors[i], 1), + "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); + } + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + IDirect3DVolumeTexture9_Release(texture); +} + START_TEST(visual) { IDirect3D9 *d3d9; @@ -14728,6 +14824,7 @@ START_TEST(visual) zenable_test(device_ptr); fog_special_test(device_ptr); volume_srgb_test(device_ptr); + volume_dxt5_test(device_ptr); hr = IDirect3DDevice9_GetDirect3D(device_ptr, &d3d9); ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr);

1 0

Stefan Dösinger : ddraw: Gracefully handle recursive SetCooperativeLevel calls.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 769dd6d158ea1ef66e33a1416724511cc4eaf1e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=769dd6d158ea1ef66e33a1416… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 2 11:22:30 2013 +0200 ddraw: Gracefully handle recursive SetCooperativeLevel calls. --- dlls/ddraw/ddraw.c | 55 ++++++++++++++++++++++++-------------------- dlls/ddraw/ddraw_private.h | 1 + 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 420c400..26f1984 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -778,21 +778,29 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, wined3d_mutex_lock(); + if (ddraw->flags & DDRAW_SCL_RECURSIVE) + { + WARN("Recursive call, returning DD_OK.\n"); + hr = DD_OK; + goto done; + } + ddraw->flags |= DDRAW_SCL_RECURSIVE; + /* Tests suggest that we need one of them: */ if(!(cooplevel & (DDSCL_SETFOCUSWINDOW | DDSCL_NORMAL | DDSCL_EXCLUSIVE ))) { TRACE("Incorrect cooplevel flags, returning DDERR_INVALIDPARAMS\n"); - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + hr = DDERR_INVALIDPARAMS; + goto done; } if ((cooplevel & DDSCL_CREATEDEVICEWINDOW) && !(cooplevel & DDSCL_EXCLUSIVE)) { WARN("DDSCL_CREATEDEVICEWINDOW requires DDSCL_EXCLUSIVE.\n"); - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + hr = DDERR_INVALIDPARAMS; + goto done; } /* Handle those levels first which set various hwnds */ @@ -810,13 +818,12 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, | DDSCL_FULLSCREEN)) { WARN("Called with incompatible flags, returning DDERR_INVALIDPARAMS.\n"); - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + hr = DDERR_INVALIDPARAMS; + goto done; } hr = ddraw_set_focus_window(ddraw, window); - wined3d_mutex_unlock(); - return hr; + goto done; } if (cooplevel & DDSCL_EXCLUSIVE) @@ -824,8 +831,8 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (!(cooplevel & DDSCL_FULLSCREEN) || !(window || (cooplevel & DDSCL_CREATEDEVICEWINDOW))) { WARN("DDSCL_EXCLUSIVE requires DDSCL_FULLSCREEN and a window.\n"); - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + hr = DDERR_INVALIDPARAMS; + goto done; } if (cooplevel & DDSCL_CREATEDEVICEWINDOW) @@ -835,8 +842,8 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (!ddraw->focuswindow && !(cooplevel & DDSCL_SETFOCUSWINDOW)) { WARN("No focus window set.\n"); - wined3d_mutex_unlock(); - return DDERR_NOFOCUSWINDOW; + hr = DDERR_NOFOCUSWINDOW; + goto done; } device_window = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "DirectDrawDeviceWnd", @@ -845,8 +852,8 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (!device_window) { ERR("Failed to create window, last error %#x.\n", GetLastError()); - wined3d_mutex_unlock(); - return E_FAIL; + hr = E_FAIL; + goto done; } ShowWindow(device_window, SW_SHOW); @@ -861,15 +868,12 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, { if (!window) { - wined3d_mutex_unlock(); - return DDERR_NOHWND; + hr = DDERR_NOHWND; + goto done; } if (FAILED(hr = ddraw_set_focus_window(ddraw, window))) - { - wined3d_mutex_unlock(); - return hr; - } + goto done; } window = device_window; @@ -910,8 +914,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (FAILED(hr = wined3d_stateblock_create(ddraw->wined3d_device, WINED3D_SBT_ALL, &stateblock))) { ERR("Failed to create stateblock, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; + goto done; } wined3d_stateblock_capture(stateblock); @@ -968,8 +971,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (FAILED(hr)) { ERR("Failed to acquire focus window, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; + goto done; } } @@ -991,9 +993,12 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, ddraw->dest_window = window; TRACE("SetCooperativeLevel retuning DD_OK\n"); + hr = DD_OK; +done: + ddraw->flags &= ~DDRAW_SCL_RECURSIVE; wined3d_mutex_unlock(); - return DD_OK; + return hr; } static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND window, DWORD flags) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 299d6ca..781d163 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -54,6 +54,7 @@ struct FvfToDecl #define DDRAW_RESTORE_MODE 0x00000004 #define DDRAW_NO3D 0x00000008 #define DDRAW_SCL_DDRAW1 0x00000010 +#define DDRAW_SCL_RECURSIVE 0x00000020 #define DDRAW_STRIDE_ALIGNMENT 8

1 0

Nikolay Sivov : ntdll: Implement interface redirection section.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 21c1706f7942a61d4348a82541256b9337571ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c1706f7942a61d4348a8254… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 11:02:14 2013 +0400 ntdll: Implement interface redirection section. --- dlls/kernel32/tests/actctx.c | 6 - dlls/ntdll/actctx.c | 243 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 235 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21c1706f7942a61d4348a…

1 0