November 2013 - Wine-Commits

Piotr Caban : qcap: Fix Avi Mux output pin Connect implementation.
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: 6dce36357aa26d7d012776d52646c96b5ac9314c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dce36357aa26d7d012776d52… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 26 14:36:19 2013 +0100 qcap: Fix Avi Mux output pin Connect implementation. --- dlls/qcap/avimux.c | 75 +++++++++++++++++----- dlls/qcap/tests/qcap.c | 167 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 218 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6dce36357aa26d7d01277…

1 0

Piotr Caban : qcap: Add helper to initalize test_filter structure.
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: 4a3b8d2e3c4d099c1c5871345f458dc13bde9a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3b8d2e3c4d099c1c5871345… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 26 14:36:04 2013 +0100 qcap: Add helper to initalize test_filter structure. --- dlls/qcap/tests/qcap.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 463a75c..80c2b33 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -984,17 +984,29 @@ static const IEnumMediaTypesVtbl EnumMediaTypesVtbl = { EnumMediaTypes_Clone }; +static void init_test_filter(test_filter *This, PIN_DIRECTION dir, filter_type type) +{ + memset(This, 0, sizeof(*This)); + This->IBaseFilter_iface.lpVtbl = &BaseFilterVtbl; + This->IEnumPins_iface.lpVtbl = &EnumPinsVtbl; + This->IPin_iface.lpVtbl = &PinVtbl; + This->IKsPropertySet_iface.lpVtbl = &KsPropertySetVtbl; + This->IEnumMediaTypes_iface.lpVtbl = &EnumMediaTypesVtbl; + + This->dir = dir; + This->filter_type = type; +} + static void test_CaptureGraphBuilder_RenderStream(void) { - test_filter source_filter = {{&BaseFilterVtbl}, {&EnumPinsVtbl}, {&PinVtbl}, - {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_OUTPUT, SOURCE_FILTER}; - test_filter sink_filter = {{&BaseFilterVtbl}, {&EnumPinsVtbl}, {&PinVtbl}, - {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_INPUT, SINK_FILTER}; - test_filter intermediate_filter = {{&BaseFilterVtbl}, {&EnumPinsVtbl}, {&PinVtbl}, - {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_OUTPUT, INTERMEDIATE_FILTER}; + test_filter source_filter, sink_filter, intermediate_filter; ICaptureGraphBuilder2 *cgb; HRESULT hr; + init_test_filter(&source_filter, PINDIR_OUTPUT, SOURCE_FILTER); + init_test_filter(&sink_filter, PINDIR_INPUT, SINK_FILTER); + init_test_filter(&intermediate_filter, PINDIR_OUTPUT, INTERMEDIATE_FILTER); + hr = CoCreateInstance(&CLSID_CaptureGraphBuilder2, NULL, CLSCTX_INPROC_SERVER, &IID_ICaptureGraphBuilder2, (void**)&cgb); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), @@ -1070,8 +1082,7 @@ static void test_AviMux_QueryInterface(void) static void test_AviMux(void) { - test_filter source_filter = {{&BaseFilterVtbl}, {&EnumPinsVtbl}, {&PinVtbl}, - {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_OUTPUT, SOURCE_FILTER}; + test_filter source_filter; VIDEOINFOHEADER videoinfoheader; IPin *avimux_in, *avimux_out, *pin; AM_MEDIA_TYPE source_media_type; @@ -1082,6 +1093,8 @@ static void test_AviMux(void) IEnumMediaTypes *emt; HRESULT hr; + init_test_filter(&source_filter, PINDIR_OUTPUT, SOURCE_FILTER); + hr = CoCreateInstance(&CLSID_AviDest, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avimux); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "couldn't create AVI Mux filter, hr = %08x\n", hr);

1 0

Piotr Caban : qcap: Constify vtables in Avi Mux tests.
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: be3695460518b1924bb65c3cfe2d90cfbceab5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3695460518b1924bb65c3cf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 26 14:35:34 2013 +0100 qcap: Constify vtables in Avi Mux tests. --- dlls/qcap/tests/qcap.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index b17ee40..463a75c 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -454,7 +454,7 @@ static HRESULT WINAPI GraphBuilder_ShouldOperationContinue(IGraphBuilder *iface) return E_NOTIMPL; } -static IGraphBuilderVtbl GraphBuilder_vtbl = { +static const IGraphBuilderVtbl GraphBuilder_vtbl = { GraphBuilder_QueryInterface, GraphBuilder_AddRef, GraphBuilder_Release, @@ -604,7 +604,7 @@ static HRESULT WINAPI BaseFilter_QueryVendorInfo(IBaseFilter *iface, LPWSTR *pVe return E_NOTIMPL; } -static IBaseFilterVtbl BaseFilterVtbl = { +static const IBaseFilterVtbl BaseFilterVtbl = { BaseFilter_QueryInterface, BaseFilter_AddRef, BaseFilter_Release, @@ -680,7 +680,7 @@ static HRESULT WINAPI EnumPins_Clone(IEnumPins *iface, IEnumPins **ppEnum) return E_NOTIMPL; } -static IEnumPinsVtbl EnumPinsVtbl = { +static const IEnumPinsVtbl EnumPinsVtbl = { EnumPins_QueryInterface, EnumPins_AddRef, EnumPins_Release, @@ -829,7 +829,7 @@ static HRESULT WINAPI Pin_NewSegment(IPin *iface, REFERENCE_TIME tStart, return E_NOTIMPL; } -static IPinVtbl PinVtbl = { +static const IPinVtbl PinVtbl = { Pin_QueryInterface, Pin_AddRef, Pin_Release, @@ -901,7 +901,7 @@ static HRESULT WINAPI KsPropertySet_QuerySupported(IKsPropertySet *iface, return E_NOTIMPL; } -static IKsPropertySetVtbl KsPropertySetVtbl = { +static const IKsPropertySetVtbl KsPropertySetVtbl = { KsPropertySet_QueryInterface, KsPropertySet_AddRef, KsPropertySet_Release, @@ -974,7 +974,7 @@ static HRESULT WINAPI EnumMediaTypes_Clone(IEnumMediaTypes *iface, IEnumMediaTyp return E_NOTIMPL; } -static IEnumMediaTypesVtbl EnumMediaTypesVtbl = { +static const IEnumMediaTypesVtbl EnumMediaTypesVtbl = { EnumMediaTypes_QueryInterface, EnumMediaTypes_AddRef, EnumMediaTypes_Release,

1 0

Piotr Caban : qcap: Add Avi Mux input pin ReceiveConnection test.
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: 56062fb9d58a72bb7fafd9b37c5e34599a8520c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56062fb9d58a72bb7fafd9b37… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 26 14:35:08 2013 +0100 qcap: Add Avi Mux input pin ReceiveConnection test. --- dlls/qcap/avimux.c | 6 +++--- dlls/qcap/tests/qcap.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index a44cfa1..37849f6 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -953,9 +953,6 @@ static HRESULT WINAPI AviMuxIn_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE FIXME("(%p:%s)->(AM_MEDIA_TYPE(%p))\n", base, debugstr_w(base->pinInfo.achName), pmt); dump_AM_MEDIA_TYPE(pmt); - if(!pmt) - return E_POINTER; - if(IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio) && IsEqualIID(&pmt->formattype, &FORMAT_WaveFormatEx)) return S_OK; @@ -1073,6 +1070,9 @@ static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, debugstr_w(avimuxin->pin.pin.pinInfo.achName), pConnector, pmt); dump_AM_MEDIA_TYPE(pmt); + if(!pmt) + return E_POINTER; + hr = BaseInputPinImpl_ReceiveConnection(iface, pConnector, pmt); if(FAILED(hr)) return hr; diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 03aa5ad..b17ee40 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -275,6 +275,9 @@ int call_no; static void check_calls_list(const char *func, call_id id, filter_type type) { + if(!current_calls_list) + return; + while(current_calls_list[call_no].wine_missing || current_calls_list[call_no].wine_extra || current_calls_list[call_no].optional || current_calls_list[call_no].broken) { if(current_calls_list[call_no].wine_missing) { @@ -1067,7 +1070,11 @@ static void test_AviMux_QueryInterface(void) static void test_AviMux(void) { - IPin *avimux_in, *avimux_out; + test_filter source_filter = {{&BaseFilterVtbl}, {&EnumPinsVtbl}, {&PinVtbl}, + {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_OUTPUT, SOURCE_FILTER}; + VIDEOINFOHEADER videoinfoheader; + IPin *avimux_in, *avimux_out, *pin; + AM_MEDIA_TYPE source_media_type; AM_MEDIA_TYPE *media_type; PIN_DIRECTION dir; IBaseFilter *avimux; @@ -1128,6 +1135,35 @@ static void test_AviMux(void) ok(hr == S_FALSE, "Next returned %x\n", hr); IEnumMediaTypes_Release(emt); + hr = IPin_ReceiveConnection(avimux_in, &source_filter.IPin_iface, NULL); + ok(hr == E_POINTER, "ReceiveConnection returned %x\n", hr); + + current_calls_list = NULL; + memset(&source_media_type, 0, sizeof(AM_MEDIA_TYPE)); + memset(&videoinfoheader, 0, sizeof(VIDEOINFOHEADER)); + source_media_type.majortype = MEDIATYPE_Video; + source_media_type.subtype = MEDIASUBTYPE_RGB32; + source_media_type.formattype = FORMAT_VideoInfo; + source_media_type.bFixedSizeSamples = TRUE; + source_media_type.lSampleSize = 40000; + source_media_type.cbFormat = sizeof(VIDEOINFOHEADER); + source_media_type.pbFormat = (BYTE*)&videoinfoheader; + videoinfoheader.AvgTimePerFrame = 333333; + videoinfoheader.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + videoinfoheader.bmiHeader.biWidth = 100; + videoinfoheader.bmiHeader.biHeight = 100; + videoinfoheader.bmiHeader.biPlanes = 1; + videoinfoheader.bmiHeader.biBitCount = 32; + videoinfoheader.bmiHeader.biSizeImage = 40000; + videoinfoheader.bmiHeader.biClrImportant = 256; + hr = IPin_ReceiveConnection(avimux_in, &source_filter.IPin_iface, &source_media_type); + ok(hr == S_OK, "ReceiveConnection returned %x\n", hr); + + hr = IPin_ConnectedTo(avimux_in, &pin); + ok(hr == S_OK, "ConnectedTo returned %x\n", hr); + ok(pin == &source_filter.IPin_iface, "incorrect pin: %p, expected %p\n", + pin, &source_filter.IPin_iface); + IPin_Release(avimux_in); IPin_Release(avimux_out); IBaseFilter_Release(avimux);

1 0

Piotr Caban : qcap: Add Avi Mux filter EnumMediaTypes tests.
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: 6348029c61bb966ce9638192fdaef44baa392f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6348029c61bb966ce9638192f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 26 14:34:48 2013 +0100 qcap: Add Avi Mux filter EnumMediaTypes tests. --- dlls/qcap/avimux.c | 5 +--- dlls/qcap/tests/qcap.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index ffd35c5..a44cfa1 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -668,7 +668,6 @@ static HRESULT WINAPI AviMuxOut_AttemptConnection(BasePin *base, static LONG WINAPI AviMuxOut_GetMediaTypeVersion(BasePin *base) { - FIXME("(%p)\n", base); return 0; } @@ -972,14 +971,12 @@ static HRESULT WINAPI AviMuxIn_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE static LONG WINAPI AviMuxIn_GetMediaTypeVersion(BasePin *base) { - FIXME("(%p:%s)\n", base, debugstr_w(base->pinInfo.achName)); return 0; } static HRESULT WINAPI AviMuxIn_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt) { - FIXME("(%p:%s)->(%d %p)\n", base, debugstr_w(base->pinInfo.achName), iPosition, amt); - return E_NOTIMPL; + return S_FALSE; } static const BasePinFuncTable AviMuxIn_BaseFuncTable = { diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 0d84d49..03aa5ad 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1065,6 +1065,74 @@ static void test_AviMux_QueryInterface(void) IUnknown_Release(avimux); } +static void test_AviMux(void) +{ + IPin *avimux_in, *avimux_out; + AM_MEDIA_TYPE *media_type; + PIN_DIRECTION dir; + IBaseFilter *avimux; + IEnumPins *ep; + IEnumMediaTypes *emt; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_AviDest, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avimux); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), + "couldn't create AVI Mux filter, hr = %08x\n", hr); + if(hr != S_OK) { + win_skip("AVI Mux filter is not registered\n"); + return; + } + + hr = IBaseFilter_EnumPins(avimux, &ep); + ok(hr == S_OK, "EnumPins returned %x\n", hr); + + hr = IEnumPins_Next(ep, 1, &avimux_out, NULL); + ok(hr == S_OK, "Next returned %x\n", hr); + hr = IPin_QueryDirection(avimux_out, &dir); + ok(hr == S_OK, "QueryDirection returned %x\n", hr); + ok(dir == PINDIR_OUTPUT, "dir = %d\n", dir); + + hr = IEnumPins_Next(ep, 1, &avimux_in, NULL); + ok(hr == S_OK, "Next returned %x\n", hr); + hr = IPin_QueryDirection(avimux_in, &dir); + ok(hr == S_OK, "QueryDirection returned %x\n", hr); + ok(dir == PINDIR_INPUT, "dir = %d\n", dir); + IEnumPins_Release(ep); + + hr = IPin_EnumMediaTypes(avimux_out, &emt); + ok(hr == S_OK, "EnumMediaTypes returned %x\n", hr); + hr = IEnumMediaTypes_Next(emt, 1, &media_type, NULL); + ok(hr == S_OK, "Next returned %x\n", hr); + ok(IsEqualIID(&media_type->majortype, &MEDIATYPE_Stream), "majortype = %s\n", + debugstr_guid(&media_type->majortype)); + ok(IsEqualIID(&media_type->subtype, &MEDIASUBTYPE_Avi), "subtype = %s\n", + debugstr_guid(&media_type->subtype)); + ok(media_type->bFixedSizeSamples, "bFixedSizeSamples = %x\n", media_type->bFixedSizeSamples); + ok(!media_type->bTemporalCompression, "bTemporalCompression = %x\n", media_type->bTemporalCompression); + ok(media_type->lSampleSize == 1, "lSampleSize = %d\n", media_type->lSampleSize); + ok(IsEqualIID(&media_type->formattype, &GUID_NULL), "formattype = %s\n", + debugstr_guid(&media_type->formattype)); + ok(!media_type->pUnk, "pUnk = %p\n", media_type->pUnk); + ok(!media_type->cbFormat, "cbFormat = %d\n", media_type->cbFormat); + ok(!media_type->pbFormat, "pbFormat = %p\n", media_type->pbFormat); + CoTaskMemFree(media_type); + hr = IEnumMediaTypes_Next(emt, 1, &media_type, NULL); + ok(hr == S_FALSE, "Next returned %x\n", hr); + IEnumMediaTypes_Release(emt); + + hr = IPin_EnumMediaTypes(avimux_in, &emt); + ok(hr == S_OK, "EnumMediaTypes returned %x\n", hr); + hr = IEnumMediaTypes_Reset(emt); + ok(hr == S_OK, "Reset returned %x\n", hr); + hr = IEnumMediaTypes_Next(emt, 1, &media_type, NULL); + ok(hr == S_FALSE, "Next returned %x\n", hr); + IEnumMediaTypes_Release(emt); + + IPin_Release(avimux_in); + IPin_Release(avimux_out); + IBaseFilter_Release(avimux); +} + START_TEST(qcap) { if (SUCCEEDED(CoInitialize(NULL))) @@ -1072,6 +1140,7 @@ START_TEST(qcap) test_smart_tee_filter(); test_CaptureGraphBuilder_RenderStream(); test_AviMux_QueryInterface(); + test_AviMux(); CoUninitialize(); } else

1 0

Piotr Caban : strmbase: Don' t pass NULL fetched parameter in BaseOutputPinImpl_Connect on external IPin implementation .
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: d6f8d8f25b96dbb97c769debd1268754de38cd35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f8d8f25b96dbb97c769debd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 26 14:34:32 2013 +0100 strmbase: Don't pass NULL fetched parameter in BaseOutputPinImpl_Connect on external IPin implementation. --- dlls/strmbase/pin.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index eb9b23c..e4ddd38 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -419,6 +419,9 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const TRACE("(%p/%p)->(%p, %p)\n", This, iface, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); + if (!pReceivePin) + return E_POINTER; + /* If we try to connect to ourselves, we will definitely deadlock. * There are other cases where we could deadlock too, but this * catches the obvious case */ @@ -465,9 +468,11 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const /* then try receiver filter's media types */ if (hr != S_OK && SUCCEEDED(hr = IPin_EnumMediaTypes(pReceivePin, &pEnumCandidates))) /* if we haven't already connected successfully */ { + ULONG fetched; + hr = VFW_E_NO_ACCEPTABLE_TYPES; /* Assume the worst, but set to S_OK if connected successfully */ - while (S_OK == IEnumMediaTypes_Next(pEnumCandidates, 1, &pmtCandidate, NULL)) + while (S_OK == IEnumMediaTypes_Next(pEnumCandidates, 1, &pmtCandidate, &fetched)) { assert(pmtCandidate); dump_AM_MEDIA_TYPE(pmtCandidate);

1 0

Henri Verbeet : ddraw: Move the cube map validation from CreateSurface() to ddraw_surface_create_texture().
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: 995ff1d3f896b47caf6378456427a9605c3c34b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=995ff1d3f896b47caf6378456… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 26 10:41:51 2013 +0100 ddraw: Move the cube map validation from CreateSurface() to ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 24 ------------------------ dlls/ddraw/surface.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a056ec6..c0b1304 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2877,30 +2877,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, return DDERR_INVALIDCAPS; } - /* Check cube maps but only if the size includes them */ - if (DDSD->dwSize >= sizeof(DDSURFACEDESC2)) - { - if(DDSD->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES && - !(DDSD->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)) - { - WARN("Cube map faces requested without cube map flag\n"); - return DDERR_INVALIDCAPS; - } - if(DDSD->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP && - (DDSD->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES) == 0) - { - WARN("Cube map without faces requested\n"); - return DDERR_INVALIDPARAMS; - } - - /* Quick tests confirm those can be created, but we don't do that yet */ - if(DDSD->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP && - (DDSD->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES) != DDSCAPS2_CUBEMAP_ALLFACES) - { - FIXME("Partial cube maps not supported yet\n"); - } - } - /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e34531f..c5ff3e6 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,6 +5608,24 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, DDRAW_dump_surface_desc(desc); } + if ((desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES) + && !(desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)) + { + WARN("Cube map faces requested without cube map flag.\n"); + return DDERR_INVALIDCAPS; + } + + if ((desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + && !(desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES)) + { + WARN("Cube map without faces requested.\n"); + return DDERR_INVALIDPARAMS; + } + + if ((desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + && (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES) != DDSCAPS2_CUBEMAP_ALLFACES) + FIXME("Partial cube maps not implemented.\n"); + if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { if (!(desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE))

1 0

Henri Verbeet : ddraw: Move the TEXTUREMANAGE validation from CreateSurface () to ddraw_surface_create_texture().
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: f0f38d9b8d5654923ede43dcba8c9423b4e7cc6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f38d9b8d5654923ede43dcb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 26 10:41:50 2013 +0100 ddraw: Move the TEXTUREMANAGE validation from CreateSurface() to ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 15 --------------- dlls/ddraw/surface.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e3373a9..a056ec6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2901,21 +2901,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } - if (DDSD->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) - { - if (!(DDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) - { - WARN("DDSCAPS2_TEXTUREMANAGE used without DDSCAPS_TEXTURE, returning DDERR_INVALIDCAPS.\n"); - return DDERR_INVALIDCAPS; - } - if (DDSD->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) - { - WARN("DDSCAPS2_TEXTUREMANAGE used width DDSCAPS_VIDEOMEMORY " - "or DDSCAPS_SYSTEMMEMORY, returning DDERR_INVALIDCAPS.\n"); - return DDERR_INVALIDCAPS; - } - } - /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 21eff17..e34531f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,6 +5608,21 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, DDRAW_dump_surface_desc(desc); } + if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) + { + if (!(desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + { + WARN("DDSCAPS2_TEXTUREMANAGE used without DDSCAPS_TEXTURE, returning DDERR_INVALIDCAPS.\n"); + return DDERR_INVALIDCAPS; + } + if (desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) + { + WARN("DDSCAPS2_TEXTUREMANAGE used width DDSCAPS_VIDEOMEMORY " + "or DDSCAPS_SYSTEMMEMORY, returning DDERR_INVALIDCAPS.\n"); + return DDERR_INVALIDCAPS; + } + } + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr);

1 0

Henri Verbeet : ddraw: Don' t bother setting *surface to NULL in CreateSurface().
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: 4d9c3151c332a0d21a63f522ae4e9a1b5be6aecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9c3151c332a0d21a63f522a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 26 10:41:49 2013 +0100 ddraw: Don't bother setting *surface to NULL in CreateSurface(). None of the callers depend on this. --- dlls/ddraw/ddraw.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 88e220e..e3373a9 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2856,12 +2856,11 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, DDSD->dwFlags &= ~DDSD_LPSURFACE; } - if((DDSD->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE) && - !(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + if ((DDSD->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE)) + == (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE) + && !(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) { - TRACE("(%p): Attempt to create a flipable primary surface without DDSCL_EXCLUSIVE set\n", - ddraw); - *surface = NULL; + WARN("Attempted to create a flipable primary surface without DDSCL_EXCLUSIVE.\n"); return DDERR_NOEXCLUSIVEMODE; } @@ -2871,11 +2870,10 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, return DDERR_INVALIDCAPS; } - if((DDSD->ddsCaps.dwCaps & sysvidmem) == sysvidmem) + /* This is a special case in ddrawex, but not allowed in ddraw. */ + if ((DDSD->ddsCaps.dwCaps & sysvidmem) == sysvidmem) { - /* This is a special switch in ddrawex.dll, but not allowed in ddraw.dll */ - WARN("Application tries to put the surface in both system and video memory\n"); - *surface = NULL; + WARN("Tried to create a surface in both system and video memory.\n"); return DDERR_INVALIDCAPS; }

1 0

Henri Verbeet : ddraw: Don' t bother unsetting DDSCAPS2_MIPMAPSUBLEVEL in CreateSurface().
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: 659cd984d5e4f128381c2aba5c0d4dc489f17a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=659cd984d5e4f128381c2aba5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 26 10:41:48 2013 +0100 ddraw: Don't bother unsetting DDSCAPS2_MIPMAPSUBLEVEL in CreateSurface(). This is already handled in ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d81851c..88e220e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2918,10 +2918,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } - /* According to the msdn this flag is ignored by CreateSurface */ - if (DDSD->dwSize >= sizeof(DDSURFACEDESC2)) - DDSD->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; - /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD);

1 0