November 2010 - Wine-commits

Thomas Mullaly : urlmon/tests: Fixed some IUri tests that used hard coded values to use Uri_HOST.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 89670f9c01f07886c4486e9bf4a8e2be9a12d12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=89670f9c01f07886c4486e9bf… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Nov 4 18:00:06 2010 -0400 urlmon/tests: Fixed some IUri tests that used hard coded values to use Uri_HOST. --- dlls/urlmon/tests/uri.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 51a0694..2f1b490 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -3108,7 +3108,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,FALSE} }, { - {0,S_OK,FALSE}, + {Uri_HOST_UNKNOWN,S_OK,FALSE}, {0,S_FALSE,FALSE}, {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} @@ -3237,7 +3237,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,FALSE} }, { - {0,S_OK,FALSE}, + {Uri_HOST_UNKNOWN,S_OK,FALSE}, {0,S_FALSE,FALSE}, {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} @@ -3263,7 +3263,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,FALSE} }, { - {0,S_OK,FALSE}, + {Uri_HOST_UNKNOWN,S_OK,FALSE}, {0,S_FALSE,FALSE}, {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} @@ -3289,7 +3289,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,FALSE} }, { - {0,S_OK,FALSE}, + {Uri_HOST_UNKNOWN,S_OK,FALSE}, {0,S_FALSE,FALSE}, {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} @@ -3314,7 +3314,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,FALSE} }, { - {0,S_OK,FALSE}, + {Uri_HOST_UNKNOWN,S_OK,FALSE}, {0,S_FALSE,FALSE}, {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} @@ -3340,7 +3340,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,FALSE} }, { - {0,S_OK,FALSE}, + {Uri_HOST_UNKNOWN,S_OK,FALSE}, {0,S_FALSE,FALSE}, {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} @@ -3365,7 +3365,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,FALSE} }, { - {0,S_OK,FALSE}, + {Uri_HOST_UNKNOWN,S_OK,FALSE}, {0,S_FALSE,FALSE}, {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} @@ -3442,7 +3442,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,FALSE} }, { - {0,S_OK,FALSE}, + {Uri_HOST_UNKNOWN,S_OK,FALSE}, {0,S_FALSE,FALSE}, {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} @@ -3468,7 +3468,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,FALSE} }, { - {0,S_OK,FALSE}, + {Uri_HOST_UNKNOWN,S_OK,FALSE}, {0,S_FALSE,FALSE}, {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} @@ -3494,7 +3494,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,FALSE} }, { - {0,S_OK,FALSE}, + {Uri_HOST_UNKNOWN,S_OK,FALSE}, {0,S_FALSE,FALSE}, {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} @@ -3520,7 +3520,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,FALSE} }, { - {0,S_OK,FALSE}, + {Uri_HOST_UNKNOWN,S_OK,FALSE}, {0,S_FALSE,FALSE}, {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} @@ -3546,7 +3546,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,FALSE} }, { - {0,S_OK,FALSE}, + {Uri_HOST_UNKNOWN,S_OK,FALSE}, {0,S_FALSE,FALSE}, {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} @@ -3703,7 +3703,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,FALSE} }, { - {0,S_OK,FALSE}, + {Uri_HOST_UNKNOWN,S_OK,FALSE}, {0,S_FALSE,FALSE}, {URL_SCHEME_ABOUT,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE}

1 0

Vijay Kiran Kamuju : include: Add missing interfaces in d3drmobj.h.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 791b22ac9106e6ad2f92affa9365fa8906d37d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=791b22ac9106e6ad2f92affa9… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Nov 5 09:43:09 2010 -0400 include: Add missing interfaces in d3drmobj.h. --- include/d3drmobj.h | 1629 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 1629 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=791b22ac9106e6ad2f92a…

1 0

Maarten Lankhorst : quartz: Change HeapRealloc call to CoTaskMemRealloc.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 7fda01e522bfd2053060c960de538880b18d7854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fda01e522bfd2053060c960d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 4 17:54:26 2010 +0100 quartz: Change HeapRealloc call to CoTaskMemRealloc. --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 18bf97c..c2f61f2 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -99,7 +99,7 @@ static int EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) int old_ring_buffer_size = omr->ring_buffer_size; omr->ring_buffer_size += EVENTS_RING_BUFFER_INCREMENT; TRACE("omr->ring_buffer_size=%d\n",omr->ring_buffer_size); - omr->messages = HeapReAlloc(GetProcessHeap(),0,omr->messages, omr->ring_buffer_size * sizeof(Event)); + omr->messages = CoTaskMemRealloc(omr->messages, omr->ring_buffer_size * sizeof(Event)); /* Now we need to rearrange the ring buffer so that the new buffers just allocated are in between omr->msg_tosave and omr->msg_toget.

1 0

Maarten Lankhorst : quartz: Simplify all_renderers_seek.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 14229c1176900663b89acc977d9c280a4d5de961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14229c1176900663b89acc977… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 4 17:54:27 2010 +0100 quartz: Simplify all_renderers_seek. Since IAMFilterMiscFlags is supported by all source/renderer filters, use that instead. --- dlls/quartz/filtergraph.c | 57 +++++++++++++++------------------------------ 1 files changed, 19 insertions(+), 38 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c2f61f2..8189aaa 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2136,53 +2136,34 @@ typedef HRESULT (WINAPI *fnFoundSeek)(IFilterGraphImpl *This, IMediaSeeking*, DW static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, DWORD_PTR arg) { BOOL allnotimpl = TRUE; int i; - IBaseFilter* pfilter; - IEnumPins* pEnum; HRESULT hr, hr_return = S_OK; - IPin* pPin; - DWORD dummy; - PIN_DIRECTION dir; TRACE("(%p)->(%p %08lx)\n", This, FoundSeek, arg); /* Send a message to all renderers, they are responsible for broadcasting it further */ for(i = 0; i < This->nFilters; i++) { - BOOL renderer = TRUE; - pfilter = This->ppFiltersInGraph[i]; - hr = IBaseFilter_EnumPins(pfilter, &pEnum); - if (hr != S_OK) - { - WARN("Enum pins failed %x\n", hr); + IMediaSeeking *seek = NULL; + IBaseFilter* pfilter = This->ppFiltersInGraph[i]; + IAMFilterMiscFlags *flags = NULL; + ULONG filterflags; + IUnknown_QueryInterface(pfilter, &IID_IAMFilterMiscFlags, (void**)&flags); + if (!flags) + continue; + filterflags = IAMFilterMiscFlags_GetMiscFlags(flags); + IUnknown_Release(flags); + if (filterflags != AM_FILTER_MISC_FLAGS_IS_RENDERER) continue; - } - /* Check if it is a source filter */ - while(IEnumPins_Next(pEnum, 1, &pPin, &dummy) == S_OK) - { - IPin_QueryDirection(pPin, &dir); - IPin_Release(pPin); - if (dir != PINDIR_INPUT) - { - renderer = FALSE; - break; - } - } - IEnumPins_Release(pEnum); - if (renderer) - { - IMediaSeeking *seek = NULL; - IBaseFilter_QueryInterface(pfilter, &IID_IMediaSeeking, (void**)&seek); - if (!seek) - continue; - - hr = FoundSeek(This, seek, arg); - IMediaSeeking_Release(seek); - if (hr_return != E_NOTIMPL) - allnotimpl = FALSE; - if (hr_return == S_OK || (FAILED(hr) && hr != E_NOTIMPL && SUCCEEDED(hr_return))) - hr_return = hr; - } + IBaseFilter_QueryInterface(pfilter, &IID_IMediaSeeking, (void**)&seek); + if (!seek) + continue; + hr = FoundSeek(This, seek, arg); + IMediaSeeking_Release(seek); + if (hr_return != E_NOTIMPL) + allnotimpl = FALSE; + if (hr_return == S_OK || (FAILED(hr) && hr != E_NOTIMPL && SUCCEEDED(hr_return))) + hr_return = hr; } if (allnotimpl)

1 0

Maarten Lankhorst : quartz: Fix run/pause/stop in filtergraph.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 769b3b515fb2a2f8fd8827fa3a666fd8569b8614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=769b3b515fb2a2f8fd8827fa3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 4 17:54:28 2010 +0100 quartz: Fix run/pause/stop in filtergraph. --- dlls/quartz/filtergraph.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8189aaa..8c7339b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -201,7 +201,8 @@ typedef struct _IFilterGraphImpl { BOOL bUnkOuterValid; BOOL bAggregatable; GUID timeformatseek; - LONGLONG start_time; + REFERENCE_TIME start_time; + REFERENCE_TIME pause_time; LONGLONG position; LONGLONG stop_position; LONG recursioncount; @@ -1940,21 +1941,26 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); TRACE("(%p/%p)->()\n", This, iface); - if (This->state == State_Running) return S_OK; EnterCriticalSection(&This->cs); - if (This->state == State_Stopped) - This->EcCompleteCount = 0; + if (This->state == State_Running) + goto out; + This->EcCompleteCount = 0; if (This->refClock) { - IReferenceClock_GetTime(This->refClock, &This->start_time); - This->start_time += 500000; + REFERENCE_TIME now; + IReferenceClock_GetTime(This->refClock, &now); + if (This->state == State_Stopped) + This->start_time = now + 500000; + else + This->start_time += now - This->pause_time; } else This->position = This->start_time = 0; SendFilterMessage(iface, SendRun, 0); This->state = State_Running; +out: LeaveCriticalSection(&This->cs); return S_FALSE; } @@ -1963,21 +1969,16 @@ static HRESULT WINAPI MediaControl_Pause(IMediaControl *iface) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); TRACE("(%p/%p)->()\n", This, iface); - if (This->state == State_Paused) return S_OK; - EnterCriticalSection(&This->cs); - if (This->state == State_Stopped) - This->EcCompleteCount = 0; + if (This->state == State_Paused) + goto out; if (This->state == State_Running && This->refClock) - { - LONGLONG time = This->start_time; - IReferenceClock_GetTime(This->refClock, &time); - This->position += time - This->start_time; - } + IReferenceClock_GetTime(This->refClock, &This->pause_time); SendFilterMessage(iface, SendPause, 0); This->state = State_Paused; +out: LeaveCriticalSection(&This->cs); return S_FALSE; } @@ -5049,6 +5050,9 @@ static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME tStart) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + if (tStart) + FIXME("Run called with non-null tStart: %x%08x\n", + (int)(tStart>>32), (int)tStart); return MediaControl_Run((IMediaControl*)&This->IMediaControl_vtbl); }

1 0

Detlef Riekenberg : wintrust/tests: Run the test again on W98.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 179e26b3f1997bd6442a4e32b3acf991a1a09923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=179e26b3f1997bd6442a4e32b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Nov 5 13:54:05 2010 +0100 wintrust/tests: Run the test again on W98. --- dlls/wintrust/tests/softpub.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index b431ff8..9b308ac 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -78,6 +78,7 @@ typedef struct _SAFE_PROVIDER_FUNCTIONS static BOOL (WINAPI * pWTHelperGetKnownUsages)(DWORD action, PCCRYPT_OID_INFO **usages); static BOOL (WINAPI * CryptSIPCreateIndirectData_p)(SIP_SUBJECTINFO *, DWORD *, SIP_INDIRECT_DATA *); +static VOID (WINAPI * CertFreeCertificateChain_p)(PCCERT_CHAIN_CONTEXT); static void InitFunctionPtrs(void) { @@ -101,6 +102,7 @@ static void InitFunctionPtrs(void) } CRYPT32_GET_PROC(CryptSIPCreateIndirectData) + CRYPT32_GET_PROC(CertFreeCertificateChain) #undef CRYPT32_GET_PROC } @@ -412,6 +414,12 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) CRYPT_PROVIDER_SGNR sgnr = { sizeof(sgnr), { 0 } }; HRESULT ret; + if (!CertFreeCertificateChain_p) + { + win_skip("CertFreeCertificateChain not found\n"); + return; + } + data.padwTrustStepErrors = funcs->pfnAlloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); if (!data.padwTrustStepErrors) @@ -469,7 +477,7 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) data.pasSigners[0].pasCertChain[0].dwConfidence); CertFreeCertificateContext( data.pasSigners[0].pasCertChain[0].pCert); - CertFreeCertificateChain(data.pasSigners[0].pChainContext); + CertFreeCertificateChain_p(data.pasSigners[0].pChainContext); CertFreeCertificateContext(cert); } }

1 0

Henri Verbeet : wined3d: Add support for the INTZ format.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: f0b0c1b1dddf606177651deb45c0afd6259076aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b0c1b1dddf606177651deb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 5 14:11:35 2010 +0100 wined3d: Add support for the INTZ format. --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/utils.c | 13 +++++++++++++ include/wine/wined3d.idl | 1 + 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b25e399..32d2431 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3470,6 +3470,12 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, const struct case WINED3DFMT_D32_FLOAT: return TRUE; + case WINED3DFMT_INTZ: + if (gl_info->supported[EXT_PACKED_DEPTH_STENCIL] + || gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) + return TRUE; + return FALSE; + /***** * Not supported everywhere(depends on GL_ATI_envmap_bumpmap or * GL_NV_texture_shader). Emulated by shaders diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index efeaa14..f2d6bde 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -130,6 +130,7 @@ static const struct StaticPixelFormatDesc formats[] = /* Vendor-specific formats */ {WINED3DFMT_ATI2N, 0x0, 0x0, 0x0, 0x0, 1, 0, 0}, {WINED3DFMT_NVDB, 0x0, 0x0, 0x0, 0x0, 0, 0, 0}, + {WINED3DFMT_INTZ, 0x0, 0x0, 0x0, 0x0, 4, 24, 8}, {WINED3DFMT_NVHU, 0x0, 0x0, 0x0, 0x0, 2, 0, 0}, {WINED3DFMT_NVHS, 0x0, 0x0, 0x0, 0x0, 2, 0, 0}, }; @@ -856,6 +857,16 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, + {WINED3DFMT_INTZ, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, + GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 0, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH + | WINED3DFMT_FLAG_STENCIL, + EXT_PACKED_DEPTH_STENCIL, NULL}, + {WINED3DFMT_INTZ, GL_DEPTH24_STENCIL8, GL_DEPTH24_STENCIL8, 0, + GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 0, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH + | WINED3DFMT_FLAG_STENCIL, + ARB_FRAMEBUFFER_OBJECT, NULL}, }; static inline int getFmtIdx(enum wined3d_format_id format_id) @@ -1720,6 +1731,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_B5G5R5A1_UNORM); FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM); FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM); + FMT_TO_STR(WINED3DFMT_INTZ); #undef FMT_TO_STR default: { @@ -2546,6 +2558,7 @@ BOOL getDepthStencilBits(const struct wined3d_format *format, short *depthSize, case WINED3DFMT_S8_UINT_D24_FLOAT: case WINED3DFMT_D32_UNORM: case WINED3DFMT_D32_FLOAT: + case WINED3DFMT_INTZ: break; default: FIXME("Unsupported depth/stencil format %s.\n", debug_d3dformat(format->id)); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 63de528..c816a29 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -274,6 +274,7 @@ enum wined3d_format_id WINED3DFMT_NVDB = WINEMAKEFOURCC('N','V','D','B'), WINED3DFMT_NVHU = WINEMAKEFOURCC('N','V','H','U'), WINED3DFMT_NVHS = WINEMAKEFOURCC('N','V','H','S'), + WINED3DFMT_INTZ = WINEMAKEFOURCC('I','N','T','Z'), WINED3DFMT_FORCE_DWORD = 0xffffffff };

1 0

Henri Verbeet : d3d8/tests: Add a test for INTZ.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: b93814e959758ea068b1ae5d51f2019c54542d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93814e959758ea068b1ae5d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 5 14:11:36 2010 +0100 d3d8/tests: Add a test for INTZ. --- dlls/d3d8/tests/visual.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 190 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b93814e959758ea068b1a…

1 0

Henri Verbeet : d3d9/tests: Add a test for INTZ.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: e279fa2afd883df9358e11b8736b325ebc53bf06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e279fa2afd883df9358e11b87… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 5 14:11:37 2010 +0100 d3d9/tests: Add a test for INTZ. --- dlls/d3d9/tests/visual.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 175 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e25fc34..887f302 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10816,6 +10816,180 @@ static void depth_buffer_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); } +static void intz_test(IDirect3DDevice9 *device) +{ + static const DWORD ps_code[] = + { + 0xffff0200, /* ps_2_0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x0200001f, 0x80000000, 0xb00f0000, /* dcl t0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 0.0, 0.0, 0.0, 1.0 */ + 0x02000001, 0x800f0001, 0xa0e40000, /* mov r1, c0 */ + 0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texld r0, t0, s0 */ + 0x02000001, 0x80010001, 0x80e40000, /* mov r1.x, r0 */ + 0x03010042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texldp r0, t0, s0 */ + 0x02000001, 0x80020001, 0x80000000, /* mov r1.y, r0.x */ + 0x02000001, 0x800f0800, 0x80e40001, /* mov 0C0, r1 */ + 0x0000ffff, /* end */ + }; + struct + { + float x, y, z; + float s, t, p, q; + } + quad[] = + { + { -1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f}, + { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f}, + { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}, + { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f}, + }; + struct + { + UINT x, y; + D3DCOLOR color; + } + expected_colors[] = + { + {400, 60, D3DCOLOR_ARGB(0x00, 0x9f, 0xff, 0x00)}, + {560, 180, D3DCOLOR_ARGB(0x00, 0xdf, 0x55, 0x00)}, + {560, 300, D3DCOLOR_ARGB(0x00, 0xdf, 0x66, 0x00)}, + {400, 420, D3DCOLOR_ARGB(0x00, 0x9f, 0xb6, 0x00)}, + {240, 420, D3DCOLOR_ARGB(0x00, 0x60, 0x6d, 0x00)}, + { 80, 300, D3DCOLOR_ARGB(0x00, 0x20, 0x33, 0x00)}, + { 80, 180, D3DCOLOR_ARGB(0x00, 0x20, 0x55, 0x00)}, + {240, 60, D3DCOLOR_ARGB(0x00, 0x60, 0xff, 0x00)}, + }; + + IDirect3DSurface9 *original_ds, *original_rt, *rt; + IDirect3DTexture9 *texture; + IDirect3DPixelShader9 *ps; + IDirect3DSurface9 *ds; + IDirect3D9 *d3d9; + D3DCAPS9 caps; + HRESULT hr; + UINT i; + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "GetDeviceCaps failed, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0)) + { + skip("No pixel shader 2.0 support, skipping INTZ test.\n"); + return; + } + + hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); + ok(SUCCEEDED(hr), "GetDirect3D failed, hr %#x.\n", hr); + + hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, MAKEFOURCC('I','N','T','Z')); + if (FAILED(hr)) + { + skip("No INTZ support, skipping INTZ test.\n"); + return; + } + + IDirect3D9_Release(d3d9); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &original_rt); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &original_ds); + ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateTexture(device, 1024, 1024, 1, + D3DUSAGE_DEPTHSTENCIL, MAKEFOURCC('I','N','T','Z'), D3DPOOL_DEFAULT, &texture, NULL); + ok(SUCCEEDED(hr), "CreateTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 1024, 1024, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); + ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps_code, &ps); + ok(SUCCEEDED(hr), "CreatePixelShader failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE4(0)); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_ALWAYS); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSU, D3DTADDRESS_WRAP); + ok(SUCCEEDED(hr), "SetSamplerState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSV, D3DTADDRESS_WRAP); + ok(SUCCEEDED(hr), "SetSamplerState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "SetSamplerState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MINFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "SetSamplerState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "SetSamplerState failed, hr %#x.\n", hr); + + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &ds); + ok(SUCCEEDED(hr), "GetSurfaceLevel failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); + + /* Setup the depth/stencil surface. */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); + + /* Read the depth values back. */ + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + { + D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + ok(color_match(color, expected_colors[i].color, 1), + "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", + expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, original_ds); + ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); + IDirect3DSurface9_Release(original_ds); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + IDirect3DTexture9_Release(texture); + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); + IDirect3DPixelShader9_Release(ps); + + IDirect3DSurface9_Release(original_rt); + IDirect3DSurface9_Release(rt); +} + static void shadow_test(IDirect3DDevice9 *device) { static const DWORD ps_code[] = @@ -11382,6 +11556,7 @@ START_TEST(visual) alphareplicate_test(device_ptr); dp3_alpha_test(device_ptr); depth_buffer_test(device_ptr); + intz_test(device_ptr); shadow_test(device_ptr); fp_special_test(device_ptr); depth_bounds_test(device_ptr);

1 0

Henri Verbeet : wined3d: Use SetWindowPos() to make the focus window active .
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: feaf81f60df974e4f9fbd7758aca15c7ceba40bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=feaf81f60df974e4f9fbd7758… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 5 14:11:38 2010 +0100 wined3d: Use SetWindowPos() to make the focus window active. --- dlls/d3d8/tests/device.c | 1 + dlls/d3d9/tests/device.c | 1 + dlls/ddraw/tests/d3d.c | 1 + dlls/wined3d/device.c | 2 +- 4 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2774b6a..1adedc3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1621,6 +1621,7 @@ static void test_wndproc(void) static const struct message messages[] = { + {WM_WINDOWPOSCHANGING, FOCUS_WINDOW}, {WM_ACTIVATE, FOCUS_WINDOW}, {WM_SETFOCUS, FOCUS_WINDOW}, {WM_WINDOWPOSCHANGING, DEVICE_WINDOW}, diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 870ca49..bb57917 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2465,6 +2465,7 @@ static void test_wndproc(void) static const struct message messages[] = { + {WM_WINDOWPOSCHANGING, FOCUS_WINDOW}, {WM_ACTIVATE, FOCUS_WINDOW}, {WM_SETFOCUS, FOCUS_WINDOW}, {0, 0}, diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index bbd4bbd..afa1d84 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3272,6 +3272,7 @@ static void test_wndproc(void) static const UINT messages[] = { + WM_WINDOWPOSCHANGING, WM_ACTIVATE, WM_SETFOCUS, 0, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3221ea8..1263cbb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1763,7 +1763,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_AcquireFocusWindow(IWineD3DDevice *ifac } device->focus_window = window; - SetForegroundWindow(window); + SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); return WINED3D_OK; }

1 0