June 2019 - Wine-Devel - list.winehq.org

[PATCH 1/5] qcap/avimux: Store the source pin and AVI data inline in the AviMux structure.
by Zebediah Figura June 16, 2019

June 16, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/avimux.c | 193 +++++++++++++++++++++------------------------ 1 file changed, 92 insertions(+), 101 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 9dcff5074e6..784d93a57c4 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -39,22 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); #define AVISTDINDEX_ENTRIES 4000 #define ALIGN(x) ((x+1)/2*2) -typedef struct { - BaseOutputPin pin; - IQualityControl IQualityControl_iface; - - int cur_stream; - LONGLONG cur_time; - - int buf_pos; - BYTE buf[65536]; - - int movi_off; - int out_pos; - int size; - IStream *stream; -} AviMuxOut; - typedef struct { BaseInputPin pin; IAMStreamControl IAMStreamControl_iface; @@ -97,7 +81,9 @@ typedef struct { REFERENCE_TIME interleave; REFERENCE_TIME preroll; - AviMuxOut *out; + BaseOutputPin source; + IQualityControl IQualityControl_iface; + int input_pin_no; AviMuxIn *in[MAX_PIN_NO-1]; @@ -107,6 +93,17 @@ typedef struct { int idx1_entries; int idx1_size; AVIINDEXENTRY *idx1; + + int cur_stream; + LONGLONG cur_time; + + int buf_pos; + BYTE buf[65536]; + + int movi_off; + int out_pos; + int size; + IStream *stream; } AviMux; static HRESULT create_input_pin(AviMux*); @@ -121,7 +118,7 @@ static IPin *avi_mux_get_pin(BaseFilter *iface, unsigned int index) AviMux *filter = impl_from_BaseFilter(iface); if (!index) - return &filter->out->pin.pin.IPin_iface; + return &filter->source.pin.IPin_iface; else if (index <= filter->input_pin_no) return &filter->in[index - 1]->pin.pin.IPin_iface; return NULL; @@ -132,7 +129,7 @@ static void avi_mux_destroy(BaseFilter *iface) AviMux *filter = impl_from_BaseFilter(iface); int i; - BaseOutputPinImpl_Release(&filter->out->pin.pin.IPin_iface); + strmbase_source_cleanup(&filter->source); for (i = 0; i < filter->input_pin_no; ++i) { @@ -187,16 +184,16 @@ static HRESULT out_flush(AviMux *This) ULONG written; HRESULT hr; - if(!This->out->buf_pos) + if(!This->buf_pos) return S_OK; - hr = IStream_Write(This->out->stream, This->out->buf, This->out->buf_pos, &written); + hr = IStream_Write(This->stream, This->buf, This->buf_pos, &written); if(FAILED(hr)) return hr; - if(written != This->out->buf_pos) + if (written != This->buf_pos) return E_FAIL; - This->out->buf_pos = 0; + This->buf_pos = 0; return S_OK; } @@ -210,13 +207,13 @@ static HRESULT out_seek(AviMux *This, int pos) return hr; li.QuadPart = pos; - hr = IStream_Seek(This->out->stream, li, STREAM_SEEK_SET, NULL); + hr = IStream_Seek(This->stream, li, STREAM_SEEK_SET, NULL); if(FAILED(hr)) return hr; - This->out->out_pos = pos; - if(This->out->out_pos > This->out->size) - This->out->size = This->out->out_pos; + This->out_pos = pos; + if(This->out_pos > This->size) + This->size = This->out_pos; return hr; } @@ -226,18 +223,18 @@ static HRESULT out_write(AviMux *This, const void *data, int size) HRESULT hr; while(1) { - if(size > sizeof(This->out->buf)-This->out->buf_pos) - chunk_size = sizeof(This->out->buf)-This->out->buf_pos; + if (size > sizeof(This->buf) - This->buf_pos) + chunk_size = sizeof(This->buf) - This->buf_pos; else chunk_size = size; - memcpy(This->out->buf + This->out->buf_pos, data, chunk_size); + memcpy(This->buf + This->buf_pos, data, chunk_size); size -= chunk_size; data = (const BYTE*)data + chunk_size; - This->out->buf_pos += chunk_size; - This->out->out_pos += chunk_size; - if(This->out->out_pos > This->out->size) - This->out->size = This->out->out_pos; + This->buf_pos += chunk_size; + This->out_pos += chunk_size; + if (This->out_pos > This->size) + This->size = This->out_pos; if(!size) break; @@ -278,7 +275,7 @@ static HRESULT flush_queue(AviMux *avimux, AviMuxIn *avimuxin, BOOL closing) DWORD flags; HRESULT hr; - if(avimux->out->cur_stream != avimuxin->stream_id) + if (avimux->cur_stream != avimuxin->stream_id) return S_OK; while(avimuxin->samples_head) { @@ -301,17 +298,18 @@ static HRESULT flush_queue(AviMux *avimux, AviMuxIn *avimuxin, BOOL closing) if(IMediaSample_IsSyncPoint(sample) == S_OK) flags |= AM_SAMPLE_SPLICEPOINT; - if(avimuxin->stream_time + (closing ? 0 : avimuxin->strh.dwScale) > avimux->out->cur_time && - !(flags & AM_SAMPLE_TIMEDISCONTINUITY)) { + if (avimuxin->stream_time + (closing ? 0 : avimuxin->strh.dwScale) > avimux->cur_time + && !(flags & AM_SAMPLE_TIMEDISCONTINUITY)) + { if(closing) break; - avimux->out->cur_stream++; - if(avimux->out->cur_stream >= avimux->input_pin_no-1) { - avimux->out->cur_time += avimux->interleave; - avimux->out->cur_stream = 0; + avimux->cur_stream++; + if(avimux->cur_stream >= avimux->input_pin_no-1) { + avimux->cur_time += avimux->interleave; + avimux->cur_stream = 0; } - avimuxin = avimux->in[avimux->out->cur_stream]; + avimuxin = avimux->in[avimux->cur_stream]; continue; } @@ -333,8 +331,8 @@ static HRESULT flush_queue(AviMux *avimux, AviMuxIn *avimuxin, BOOL closing) avimuxin->ix->nEntriesInUse = 0; avimuxin->ix->qwBaseOffset = 0; - avimuxin->ix_off = avimux->out->size; - avimux->out->size += sizeof(avimuxin->ix_data); + avimuxin->ix_off = avimux->size; + avimux->size += sizeof(avimuxin->ix_data); } if(*head_prev == avimuxin->samples_head) @@ -346,11 +344,11 @@ static HRESULT flush_queue(AviMux *avimux, AviMuxIn *avimuxin, BOOL closing) avimuxin->strh.dwLength++; if(!(flags & AM_SAMPLE_TIMEDISCONTINUITY)) { if(!avimuxin->ix->qwBaseOffset) - avimuxin->ix->qwBaseOffset = avimux->out->size; - avimuxin->ix->aIndex[avimuxin->ix->nEntriesInUse].dwOffset = avimux->out->size - + sizeof(RIFFCHUNK) - avimuxin->ix->qwBaseOffset; + avimuxin->ix->qwBaseOffset = avimux->size; + avimuxin->ix->aIndex[avimuxin->ix->nEntriesInUse].dwOffset = + avimux->size + sizeof(RIFFCHUNK) - avimuxin->ix->qwBaseOffset; - hr = out_seek(avimux, avimux->out->size); + hr = out_seek(avimux, avimux->size); if(FAILED(hr)) { IMediaSample_Release(sample); return hr; @@ -365,7 +363,7 @@ static HRESULT flush_queue(AviMux *avimux, AviMuxIn *avimuxin, BOOL closing) rf.cb = size; hr = idx1_add_entry(avimux, rf.fcc, flags & AM_SAMPLE_SPLICEPOINT ? AVIIF_KEYFRAME : 0, flags & AM_SAMPLE_TIMEDISCONTINUITY ? - avimux->idx1[avimux->idx1_entries-1].dwChunkOffset : avimux->out->size, size); + avimux->idx1[avimux->idx1_entries-1].dwChunkOffset : avimux->size, size); if(FAILED(hr)) { IMediaSample_Release(sample); return hr; @@ -432,26 +430,27 @@ static HRESULT WINAPI AviMux_Stop(IBaseFilter *iface) if(This->filter.state == State_Stopped) return S_OK; - if(This->out->stream) { + if (This->stream) + { AVIEXTHEADER dmlh; RIFFCHUNK rc; RIFFLIST rl; int idx1_off, empty_stream; - empty_stream = This->out->cur_stream; + empty_stream = This->cur_stream; for(i=empty_stream+1; ; i++) { if(i >= This->input_pin_no-1) i = 0; if(i == empty_stream) break; - This->out->cur_stream = i; - hr = flush_queue(This, This->in[This->out->cur_stream], TRUE); + This->cur_stream = i; + hr = flush_queue(This, This->in[This->cur_stream], TRUE); if(FAILED(hr)) return hr; } - idx1_off = This->out->size; + idx1_off = This->size; rc.fcc = ckidAVIOLDINDEX; rc.cb = This->idx1_entries * sizeof(*This->idx1); hr = out_write(This, &rc, sizeof(rc)); @@ -495,14 +494,14 @@ static HRESULT WINAPI AviMux_Stop(IBaseFilter *iface) return hr; rl.fcc = FCC('R','I','F','F'); - rl.cb = This->out->size-sizeof(RIFFCHUNK)-2*sizeof(int); + rl.cb = This->size - sizeof(RIFFCHUNK) - 2 * sizeof(int); rl.fccListType = FCC('A','V','I',' '); hr = out_write(This, &rl, sizeof(rl)); if(FAILED(hr)) return hr; rl.fcc = FCC('L','I','S','T'); - rl.cb = This->out->movi_off - sizeof(RIFFLIST) - sizeof(RIFFCHUNK); + rl.cb = This->movi_off - sizeof(RIFFLIST) - sizeof(RIFFCHUNK); rl.fccListType = FCC('h','d','r','l'); hr = out_write(This, &rl, sizeof(rl)); if(FAILED(hr)) @@ -550,13 +549,13 @@ static HRESULT WINAPI AviMux_Stop(IBaseFilter *iface) dmlh.dwGrandFrames = This->in[0]->strh.dwLength; hr = out_write(This, &dmlh, sizeof(dmlh)); - rl.cb = idx1_off - This->out->movi_off - sizeof(RIFFCHUNK); + rl.cb = idx1_off - This->movi_off - sizeof(RIFFCHUNK); rl.fccListType = FCC('m','o','v','i'); out_write(This, &rl, sizeof(rl)); out_flush(This); - IStream_Release(This->out->stream); - This->out->stream = NULL; + IStream_Release(This->stream); + This->stream = NULL; } This->filter.state = State_Stopped; @@ -611,9 +610,10 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) IMediaSeeking_Release(ms); } - if(This->out->pin.pMemInputPin) { - hr = IMemInputPin_QueryInterface(This->out->pin.pMemInputPin, - &IID_IStream, (void**)&This->out->stream); + if (This->source.pMemInputPin) + { + hr = IMemInputPin_QueryInterface(This->source.pMemInputPin, + &IID_IStream, (void **)&This->stream); if(FAILED(hr)) return hr; } @@ -626,7 +626,7 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) return E_OUTOFMEMORY; } - This->out->size = 3*sizeof(RIFFLIST) + sizeof(AVIMAINHEADER) + sizeof(AVIEXTHEADER); + This->size = 3*sizeof(RIFFLIST) + sizeof(AVIMAINHEADER) + sizeof(AVIEXTHEADER); This->start = -1; This->stop = -1; memset(&This->avih, 0, sizeof(This->avih)); @@ -635,34 +635,35 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) continue; This->avih.dwStreams++; - This->out->size += sizeof(RIFFLIST) + sizeof(AVISTREAMHEADER) + sizeof(RIFFCHUNK) - + This->in[i]->strf->cb + sizeof(This->in[i]->indx_data); + This->size += sizeof(RIFFLIST) + sizeof(AVISTREAMHEADER) + sizeof(RIFFCHUNK) + + This->in[i]->strf->cb + sizeof(This->in[i]->indx_data); This->in[i]->strh.dwScale = MulDiv(This->in[i]->avg_time_per_frame, This->interleave, 10000000); This->in[i]->strh.dwRate = This->interleave; hr = IMemAllocator_Commit(This->in[i]->pin.pAllocator); if(FAILED(hr)) { - if(This->out->stream) { - IStream_Release(This->out->stream); - This->out->stream = NULL; + if (This->stream) + { + IStream_Release(This->stream); + This->stream = NULL; } return hr; } } - This->out->movi_off = This->out->size; - This->out->size += sizeof(RIFFLIST); + This->movi_off = This->size; + This->size += sizeof(RIFFLIST); - idx1_add_entry(This, FCC('7','F','x','x'), 0, This->out->movi_off+sizeof(RIFFLIST), 0); + idx1_add_entry(This, FCC('7','F','x','x'), 0, This->movi_off + sizeof(RIFFLIST), 0); stream_id = 0; for(i=0; i<This->input_pin_no; i++) { if(!This->in[i]->pin.pin.pConnectedTo) continue; - This->in[i]->ix_off = This->out->size; - This->out->size += sizeof(This->in[i]->ix_data); + This->in[i]->ix_off = This->size; + This->size += sizeof(This->in[i]->ix_data); This->in[i]->ix->fcc = FCC('i','x','0'+stream_id/10,'0'+stream_id%10); This->in[i]->ix->cb = sizeof(This->in[i]->ix_data) - sizeof(RIFFCHUNK); This->in[i]->ix->wLongsPerEntry = 2; @@ -680,8 +681,8 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) This->in[i]->stream_id = stream_id++; } - This->out->buf_pos = 0; - This->out->out_pos = 0; + This->buf_pos = 0; + This->out_pos = 0; This->avih.fcc = ckidMAINAVIHEADER; This->avih.cb = sizeof(AVIMAINHEADER) - sizeof(RIFFCHUNK); @@ -813,9 +814,9 @@ static HRESULT WINAPI ConfigInterleaving_put_Mode( return E_INVALIDARG; if(This->mode != mode) { - if(This->out->pin.pin.pConnectedTo) { + if(This->source.pin.pConnectedTo) { HRESULT hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, - &This->out->pin.pin.IPin_iface); + &This->source.pin.IPin_iface); if(FAILED(hr)) return hr; } @@ -1229,12 +1230,9 @@ static const BaseOutputPinFuncTable AviMuxOut_BaseOutputFuncTable = { AviMuxOut_DecideAllocator, }; -static inline AviMux* impl_from_out_IPin(IPin *iface) +static inline AviMux *impl_from_out_IPin(IPin *iface) { - BasePin *bp = CONTAINING_RECORD(iface, BasePin, IPin_iface); - IBaseFilter *bf = bp->pinInfo.pFilter; - - return impl_from_IBaseFilter(bf); + return CONTAINING_RECORD(iface, AviMux, source.pin.IPin_iface); } static HRESULT WINAPI AviMuxOut_QueryInterface(IPin *iface, REFIID riid, void **ppv) @@ -1246,7 +1244,7 @@ static HRESULT WINAPI AviMuxOut_QueryInterface(IPin *iface, REFIID riid, void ** if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) *ppv = iface; else if(IsEqualIID(riid, &IID_IQualityControl)) - *ppv = &This->out->IQualityControl_iface; + *ppv = &This->IQualityControl_iface; else { FIXME("no interface for %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -1431,15 +1429,14 @@ static const IPinVtbl AviMuxOut_PinVtbl = { static inline AviMux* impl_from_out_IQualityControl(IQualityControl *iface) { - AviMuxOut *amo = CONTAINING_RECORD(iface, AviMuxOut, IQualityControl_iface); - return impl_from_IBaseFilter(amo->pin.pin.pinInfo.pFilter); + return CONTAINING_RECORD(iface, AviMux, IQualityControl_iface); } static HRESULT WINAPI AviMuxOut_QualityControl_QueryInterface( IQualityControl *iface, REFIID riid, void **ppv) { AviMux *This = impl_from_out_IQualityControl(iface); - return IPin_QueryInterface(&This->out->pin.pin.IPin_iface, riid, ppv); + return IPin_QueryInterface(&This->source.pin.IPin_iface, riid, ppv); } static ULONG WINAPI AviMuxOut_QualityControl_AddRef(IQualityControl *iface) @@ -2084,10 +2081,10 @@ static HRESULT WINAPI AviMuxIn_MemInputPin_ReceiveCanBlock(IMemInputPin *iface) TRACE("(%p:%s)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName)); - if(!This->out->pin.pMemInputPin) + if(!This->source.pMemInputPin) return S_FALSE; - hr = IMemInputPin_ReceiveCanBlock(This->out->pin.pMemInputPin); + hr = IMemInputPin_ReceiveCanBlock(This->source.pMemInputPin); return hr != S_FALSE ? S_OK : S_FALSE; } @@ -2289,22 +2286,16 @@ IUnknown * WINAPI QCAP_createAVIMux(IUnknown *outer, HRESULT *phr) info.dir = PINDIR_OUTPUT; info.pFilter = &avimux->filter.IBaseFilter_iface; lstrcpyW(info.achName, output_name); - hr = BaseOutputPin_Construct(&AviMuxOut_PinVtbl, sizeof(AviMuxOut), &info, - &AviMuxOut_BaseOutputFuncTable, &avimux->filter.csFilter, (IPin**)&avimux->out); - if(FAILED(hr)) { - strmbase_filter_cleanup(&avimux->filter); - HeapFree(GetProcessHeap(), 0, avimux); - *phr = hr; - return NULL; - } - avimux->out->IQualityControl_iface.lpVtbl = &AviMuxOut_QualityControlVtbl; - avimux->out->cur_stream = 0; - avimux->out->cur_time = 0; - avimux->out->stream = NULL; + strmbase_source_init(&avimux->source, &AviMuxOut_PinVtbl, &info, + &AviMuxOut_BaseOutputFuncTable, &avimux->filter.csFilter); + avimux->IQualityControl_iface.lpVtbl = &AviMuxOut_QualityControlVtbl; + avimux->cur_stream = 0; + avimux->cur_time = 0; + avimux->stream = NULL; hr = create_input_pin(avimux); if(FAILED(hr)) { - BaseOutputPinImpl_Release(&avimux->out->pin.pin.IPin_iface); + strmbase_source_cleanup(&avimux->source); strmbase_filter_cleanup(&avimux->filter); HeapFree(GetProcessHeap(), 0, avimux); *phr = hr; -- 2.21.0

1 4

[PATCH 3/3] usp10: Fix advance width when glyph is missing.
by Akihiro Sagawa June 16, 2019

June 16, 2019

This fixes a regression introduced by 8d018d8d1dadf9d731690567b9c98d5a9eae37db. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47327 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/usp10/tests/usp10.c | 4 ++-- dlls/usp10/usp10.c | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-)

2 1

[PATCH 2/3] usp10/tests: Add advance width tests with CJK bitmap font.
by Akihiro Sagawa June 16, 2019

June 16, 2019

We should use associated glyph's advance width instead of the default one. Because, when using CJK bitmap system font, full-width character (e.g. Hiragana) is rendered with associated font. The glyph is different from the default glyph. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/usp10/tests/usp10.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+)

2 1

[PATCH 1/3] usp10: Cache ScriptString_pSize value, again.
by Akihiro Sagawa June 16, 2019

June 16, 2019

Fixes a harmless regression caused by c5b41a45f92830fe64306e5b343cf0cc336fcd14. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/usp10/usp10.c | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH] dpnet: Initialize size variable. (Coverity)
by Alistair Leslie-Hughes June 16, 2019

June 16, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/peer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index f935b2a313..3df07749c5 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -157,6 +157,7 @@ HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER next_key = RegEnumKeyW( key, index, provider, MAX_PATH); while(next_key == ERROR_SUCCESS) { + size = 0; res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); if(res == ERROR_SUCCESS) { -- 2.20.1

3 3

[PATCH] advapi32: Return on failed allocation (Coverity)
by André Hentschel June 16, 2019

June 16, 2019

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/advapi32/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9269898c6be..2b2ca65e5b2 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3261,7 +3261,7 @@ static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, size = GetFullPathNameW(file_name, 0, NULL, NULL); full_name = heap_alloc(size * sizeof(WCHAR)); - if (!size) + if (!full_name) return GetLastError(); GetFullPathNameW(file_name, size, full_name, NULL); -- 2.17.1

1 0

[PATCH v2 4/4] ddraw/tests: Add tests for checking available depth formats.
by Jactry Zeng June 16, 2019

June 16, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 31 +++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 31 +++++++++++++++++++ 4 files changed, 192 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 860e101159..6ae9d0c49c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12899,6 +12899,70 @@ static void test_caps(void) IDirectDraw_Release(ddraw); } +static void test_available_formats(void) +{ + static const DWORD z_bitmasks[] = {0x00ffffff, 0xffffff00, 0xffffffff}; + DDSURFACEDESC surface_desc, desc; + IDirectDrawSurface *surface; + IDirectDraw *ddraw; + HWND window; + HRESULT hr; + int i; + + window = create_window(); + ddraw = create_ddraw(); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U2(surface_desc).dwZBufferBitDepth = 32; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok((desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags: %#x.\n", desc.dwFlags); + ok(U2(desc).dwZBufferBitDepth == 32, "Got unexpected dwZBufferBitDepth: %d.\n", U2(desc).dwZBufferBitDepth); + IDirectDrawSurface_Release(surface); + + for (i = 0; i < ARRAY_SIZE(z_bitmasks); ++i) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(surface_desc.ddpfPixelFormat).dwZBufferBitDepth = 32; + U3(surface_desc.ddpfPixelFormat).dwZBitMask = z_bitmasks[i]; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, i=%d.\n", hr, i); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok((desc.dwFlags & DDSD_ZBUFFERBITDEPTH) && !(desc.dwFlags & DDSD_PIXELFORMAT), + "Got unexpected flags: %#x, i=%d.\n", desc.dwFlags, i); + ok(U2(desc).dwZBufferBitDepth == 32, "Got unexpected dwZBufferBitDepth: %d, i=%d.\n", + U2(desc).dwZBufferBitDepth, i); + + IDirectDrawSurface_Release(surface); + } + + IDirectDraw_Release(ddraw); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -13010,4 +13074,5 @@ START_TEST(ddraw1) test_alphatest(); test_clipper_refcount(); test_caps(); + test_available_formats(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2c047a5e1f..f443352e5c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13775,6 +13775,70 @@ static void test_caps(void) IDirectDraw2_Release(ddraw); } +static void test_available_formats(void) +{ + static const DWORD z_bitmasks[] = {0x00ffffff, 0xffffff00, 0xffffffff}; + DDSURFACEDESC surface_desc, desc; + IDirectDrawSurface *surface; + IDirectDraw2 *ddraw; + HWND window; + HRESULT hr; + int i; + + window = create_window(); + ddraw = create_ddraw(); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U2(surface_desc).dwZBufferBitDepth = 32; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok((desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags: %#x.\n", desc.dwFlags); + ok(U2(desc).dwZBufferBitDepth == 32, "Got unexpected dwZBufferBitDepth: %d.\n", U2(desc).dwZBufferBitDepth); + IDirectDrawSurface_Release(surface); + + for (i = 0; i < ARRAY_SIZE(z_bitmasks); ++i) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(surface_desc.ddpfPixelFormat).dwZBufferBitDepth = 32; + U3(surface_desc.ddpfPixelFormat).dwZBitMask = z_bitmasks[i]; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, i=%d.\n", hr, i); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok((desc.dwFlags & DDSD_ZBUFFERBITDEPTH) && !(desc.dwFlags & DDSD_PIXELFORMAT), + "Got unexpected flags: %#x, i=%d.\n", desc.dwFlags, i); + ok(U2(desc).dwZBufferBitDepth == 32, "Got unexpected dwZBufferBitDepth: %d, i=%d.\n", + U2(desc).dwZBufferBitDepth, i); + + IDirectDrawSurface_Release(surface); + } + + IDirectDraw2_Release(ddraw); + DestroyWindow(window); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -13893,4 +13957,5 @@ START_TEST(ddraw2) test_alphatest(); test_clipper_refcount(); test_caps(); + test_available_formats(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 77ae359a9c..6cb7b75fca 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16215,6 +16215,36 @@ static void test_caps(void) IDirectDraw4_Release(ddraw); } +static HRESULT CALLBACK enum_available_formats(DDPIXELFORMAT *format, void *ctx) +{ + ok(U3(*format).dwZBitMask != 0xffffffff, "Got unexpected depth format: %#x.\n", U3(*format).dwZBitMask); + return DDENUMRET_OK; +} + +static void test_available_formats(void) +{ + IDirectDraw4 *ddraw; + IDirect3D3 *d3d3; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw4_QueryInterface(ddraw, &IID_IDirect3D3, (void **)&d3d3); + IDirectDraw4_Release(ddraw); + if (FAILED(hr)) + { + skip("D3D interface is not available, skipping test.\n"); + return; + } + + hr = IDirect3D3_EnumZBufferFormats(d3d3, &IID_IDirect3DHALDevice, enum_available_formats, NULL); + if (FAILED(hr)) + skip("No depth buffer formats available, skipping test.\n"); + + IDirect3D3_Release(d3d3); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -16348,4 +16378,5 @@ START_TEST(ddraw4) test_alphatest(); test_clipper_refcount(); test_caps(); + test_available_formats(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b0fc634eef..b91de58984 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16289,6 +16289,36 @@ static void test_caps(void) IDirectDraw7_Release(ddraw); } +static HRESULT CALLBACK enum_available_formats(DDPIXELFORMAT *format, void *ctx) +{ + ok(U3(*format).dwZBitMask != 0xffffffff, "Got unexpected depth format: %#x.\n", U3(*format).dwZBitMask); + return DDENUMRET_OK; +} + +static void test_available_formats(void) +{ + IDirectDraw7 *ddraw; + IDirect3D7 *d3d7; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw7_QueryInterface(ddraw, &IID_IDirect3D7, (void **)&d3d7); + IDirectDraw7_Release(ddraw); + if (FAILED(hr)) + { + skip("D3D interface is not available, skipping test.\n"); + return; + } + + hr = IDirect3D7_EnumZBufferFormats(d3d7, &IID_IDirect3DHALDevice, enum_available_formats, NULL); + if (FAILED(hr)) + skip("No depth buffer formats available, skipping test.\n"); + + IDirect3D7_Release(d3d7); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -16436,4 +16466,5 @@ START_TEST(ddraw7) test_clipper_refcount(); test_begin_end_state_block(); test_caps(); + test_available_formats(); } -- 2.20.1

2 1

[PATCH 4/4] ddraw/tests: Add test for checking available depth format.
by Jactry Zeng June 16, 2019

June 16, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ddraw/tests/ddraw4.c | 44 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 44 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index cb7582c1d4..db70fa2423 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16002,6 +16002,49 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static HRESULT CALLBACK enum_available_fmt(DDPIXELFORMAT *format, void *ctx) +{ + DDPIXELFORMAT *z_fmt = ctx; + + if (U1(*format).dwZBufferBitDepth > U1(*z_fmt).dwZBufferBitDepth) + *z_fmt = *format; + + ok(U3(*format).dwZBitMask != 0xffffffff, "Got unexpected depth format: %#x.\n", U3(*format).dwZBitMask); + + return DDENUMRET_OK; +} + +static void test_available_fmt(void) +{ + DDPIXELFORMAT z_fmt; + IDirectDraw4 *ddraw; + IDirect3D3 *d3d3; + HWND window; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + window = create_window(); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw4_QueryInterface(ddraw, &IID_IDirect3D3, (void **)&d3d3); + IDirectDraw4_Release(ddraw); + if (FAILED(hr)) + { + skip("D3D interface is not available, skipping test.\n"); + return; + } + + memset(&z_fmt, 0, sizeof(z_fmt)); + hr = IDirect3D3_EnumZBufferFormats(d3d3, &IID_IDirect3DHALDevice, enum_available_fmt, &z_fmt); + if (FAILED(hr) || !z_fmt.dwSize) + skip("No depth buffer formats available, skipping test.\n"); + + IDirect3D3_Release(d3d3); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -16134,4 +16177,5 @@ START_TEST(ddraw4) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_available_fmt(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5f066a6257..83c6671c54 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15893,6 +15893,49 @@ static void test_begin_end_state_block(void) DestroyWindow(window); } +static HRESULT CALLBACK enum_available_fmt(DDPIXELFORMAT *format, void *ctx) +{ + DDPIXELFORMAT *z_fmt = ctx; + + if (U1(*format).dwZBufferBitDepth > U1(*z_fmt).dwZBufferBitDepth) + *z_fmt = *format; + + ok(U3(*format).dwZBitMask != 0xffffffff, "Got unexpected depth format: %#x.\n", U3(*format).dwZBitMask); + + return DDENUMRET_OK; +} + +static void test_available_fmt(void) +{ + DDPIXELFORMAT z_fmt; + IDirectDraw7 *ddraw; + IDirect3D7 *d3d7; + HWND window; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + window = create_window(); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw7_QueryInterface(ddraw, &IID_IDirect3D7, (void **)&d3d7); + IDirectDraw7_Release(ddraw); + if (FAILED(hr)) + { + skip("D3D interface is not available, skipping test.\n"); + return; + } + + memset(&z_fmt, 0, sizeof(z_fmt)); + hr = IDirect3D7_EnumZBufferFormats(d3d7, &IID_IDirect3DHALDevice, enum_available_fmt, &z_fmt); + if (FAILED(hr) || !z_fmt.dwSize) + skip("No depth buffer formats available, skipping test.\n"); + + IDirect3D7_Release(d3d7); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -16038,4 +16081,5 @@ START_TEST(ddraw7) test_alphatest(); test_clipper_refcount(); test_begin_end_state_block(); + test_available_fmt(); } -- 2.20.1

4 4

[PATCH v2 3/4] d3d9/tests: Test IDirect3D9::CheckDepthStencilMatch() with D3DFMT_D32.
by Jactry Zeng June 16, 2019

June 16, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f5c89723cb..73ecae9804 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11833,6 +11833,16 @@ static void test_check_device_format(void) } } + hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DFMT_A8R8G8B8, D3DFMT_D32); + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), /* Win10 */ + "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DFMT_R5G6B5, D3DFMT_D32); + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), /* Win10 */ + "Got unexpected hr %#x.\n", hr); + IDirect3D9_Release(d3d); } -- 2.20.1

1 0

[PATCH v2 2/4] d3d8/tests: Test IDirect3D8::CheckDepthStencilMatch() with D3DFMT_D32.
by Jactry Zeng June 16, 2019

June 16, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b0a279b11b..bab08e38bf 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8261,6 +8261,16 @@ static void test_check_device_format(void) D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DFMT_A8R8G8B8, D3DFMT_D32); + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), /* Win10 */ + "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DFMT_R5G6B5, D3DFMT_D32); + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), /* Win10 */ + "Got unexpected hr %#x.\n", hr); + IDirect3D8_Release(d3d); } -- 2.20.1

1 0