wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Aric Stewart : wineqtdecoder: Optimizations for audio extraction.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: d07f46e8a8d68e310ef135d02b0b68842033ba3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07f46e8a8d68e310ef135d02… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 6 13:36:13 2011 -0500 wineqtdecoder: Optimizations for audio extraction. --- dlls/wineqtdecoder/qtsplitter.c | 58 +++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 30 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 8a3da5a..384e9c8 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -356,6 +356,9 @@ static OSErr QT_Create_Extract_Session(QTSplitter *filter) { AudioStreamBasicDescription aDesc; OSErr err; + WAVEFORMATEX* pvi; + + pvi = (WAVEFORMATEX*)filter->pAudio_Pin->pmt->pbFormat; err = MovieAudioExtractionBegin(filter->pQTMovie, 0, &filter->aSession); if (err != noErr) @@ -381,11 +384,11 @@ kQTMovieAudioExtractionAudioPropertyID_AudioStreamBasicDescription, aDesc.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger + kAudioFormatFlagIsPacked; aDesc.mFramesPerPacket = 1; - aDesc.mChannelsPerFrame = 2; - aDesc.mBitsPerChannel = 16; + aDesc.mChannelsPerFrame = pvi->nChannels; + aDesc.mBitsPerChannel = pvi->wBitsPerSample; + aDesc.mSampleRate = pvi->nSamplesPerSec; aDesc.mBytesPerFrame = (aDesc.mBitsPerChannel * aDesc.mChannelsPerFrame) / 8; aDesc.mBytesPerPacket = aDesc.mBytesPerFrame * aDesc.mFramesPerPacket; - aDesc.mSampleRate = 48000; err = MovieAudioExtractionSetProperty(filter->aSession, kQTPropertyClass_MovieAudioExtraction_Audio, @@ -408,17 +411,17 @@ kQTMovieAudioExtractionAudioPropertyID_AudioStreamBasicDescription, ERR("Unhandled Frames per packet %li\n",aDesc.mFramesPerPacket); err = -1; } - if (aDesc.mChannelsPerFrame != 2) + if (aDesc.mChannelsPerFrame != pvi->nChannels) { ERR("Unhandled channel count %li\n",aDesc.mChannelsPerFrame); err = -1; } - if (aDesc.mBitsPerChannel != 16) + if (aDesc.mBitsPerChannel != pvi->wBitsPerSample) { ERR("Unhandled bits per channel %li\n",aDesc.mBitsPerChannel); err = -1; } - if (aDesc.mSampleRate != 48000) + if (aDesc.mSampleRate != pvi->nSamplesPerSec) { ERR("Unhandled sample rate %f\n",aDesc.mSampleRate); err = -1; @@ -463,8 +466,6 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) LONGLONG tStart=0, tStop=0; float time; - MoviesTask(This->pQTMovie,0); - QTVisualContextTask(This->vContext); GetMovieNextInterestingTime(This->pQTMovie, nextTimeStep, 0, NULL, movie_time, 1, &next_time, NULL); if (next_time == -1) @@ -497,26 +498,9 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) UInt32 frames; WAVEFORMATEX* pvi; float duration; - static int audio_frame_size = 0; pvi = (WAVEFORMATEX*)This->pAudio_Pin->pmt->pbFormat; - if (audio_frame_size == 0) - audio_frame_size = (pvi->wBitsPerSample * pvi->nChannels) / 8; - - tr.value = SInt64ToWide(movie_time); - - err = MovieAudioExtractionSetProperty(This->aSession, - kQTPropertyClass_MovieAudioExtraction_Movie, - kQTMovieAudioExtractionMoviePropertyID_CurrentTime, - sizeof(TimeRecord), &tr); - - if (err != noErr) - { - ERR("Failed to set audio media time\n"); - goto audio_error; - } - hr = BaseOutputPinImpl_GetDeliveryBuffer((BaseOutputPin*)This->pAudio_Pin, &sample, NULL, NULL, 0); if (FAILED(hr)) @@ -539,7 +523,7 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) TRACE("Need audio for %f seconds (%li frames)\n",duration,frames); data_size = IMediaSample_GetSize(sample); - if (data_size < frames * audio_frame_size ) + if (data_size < frames * pvi->nBlockAlign) FIXME("Audio buffer is too small\n"); aData.mNumberBuffers = 1; @@ -550,7 +534,7 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) err = MovieAudioExtractionFillBuffer(This->aSession, &frames, &aData, &flags); TRACE("Got %i frames\n",(int)frames); - IMediaSample_SetActualDataLength(sample, frames * audio_frame_size); + IMediaSample_SetActualDataLength(sample, frames * pvi->nBlockAlign); IMediaSample_SetMediaTime(sample, &tStart, &tStop); if (tStart) @@ -850,6 +834,12 @@ static HRESULT QT_Process_Audio_Track(QTSplitter* filter, Track trk) PIN_INFO piOutput; HRESULT hr = S_OK; static const WCHAR szwAudioOut[] = {'A','u','d','i','o',0}; + Media audioMedia; + + SoundDescriptionHandle aDesc = (SoundDescriptionHandle) NewHandle(sizeof(SoundDescription)); + + audioMedia = GetTrackMedia(trk); + GetMediaSampleDescription(audioMedia, 1, (SampleDescriptionHandle)aDesc); ZeroMemory(&amt, sizeof(amt)); amt.formattype = FORMAT_WaveFormatEx; @@ -864,12 +854,20 @@ static HRESULT QT_Process_Audio_Track(QTSplitter* filter, Track trk) pvi->cbSize = sizeof(WAVEFORMATEX); pvi->wFormatTag = WAVE_FORMAT_PCM; - pvi->nChannels = 2; - pvi->nSamplesPerSec = 48000; - pvi->wBitsPerSample = 16; + pvi->nChannels = ((SoundDescription)**aDesc).numChannels; + if (pvi->nChannels < 1 || pvi->nChannels > 2) + pvi->nChannels = 2; + pvi->nSamplesPerSec = (((SoundDescription)**aDesc).sampleRate/65536); + if (pvi->nSamplesPerSec < 8000 || pvi->nChannels > 48000) + pvi->nSamplesPerSec = 44100; + pvi->wBitsPerSample = ((SoundDescription)**aDesc).sampleSize; + if (pvi->wBitsPerSample < 8 || pvi->wBitsPerSample > 32) + pvi->wBitsPerSample = 16; pvi->nBlockAlign = (pvi->nChannels * pvi->wBitsPerSample) / 8; pvi->nAvgBytesPerSec = pvi->nSamplesPerSec * pvi->nBlockAlign; + DisposeHandle((Handle)aDesc); + piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = (IBaseFilter *)filter; lstrcpyW(piOutput.achName,szwAudioOut);

1 0

Vincent Povirk : windowscodecs: Implement TiffFrameDecode_WriteSource.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 75a010581aba81792bd7dc66a25a0b5a38f2a062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a010581aba81792bd7dc66a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 14:41:45 2011 -0500 windowscodecs: Implement TiffFrameDecode_WriteSource. --- dlls/windowscodecs/tiffformat.c | 71 +++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 0968a42..78b3146 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1440,8 +1440,75 @@ static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, static HRESULT WINAPI TiffFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, IWICBitmapSource *pIBitmapSource, WICRect *prc) { - FIXME("(%p,%p,%p): stub\n", iface, pIBitmapSource, prc); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; + WICRect rc; + WICPixelFormatGUID guid; + UINT stride; + BYTE *pixeldata; + + TRACE("(%p,%p,%p)\n", iface, pIBitmapSource, prc); + + if (!This->initialized || !This->width || !This->height) + return WINCODEC_ERR_WRONGSTATE; + + if (!This->format) + { + hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); + if (FAILED(hr)) return hr; + hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &guid); + if (FAILED(hr)) return hr; + } + + hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); + if (FAILED(hr)) return hr; + if (memcmp(&guid, This->format->guid, sizeof(GUID)) != 0) + { + /* FIXME: should use WICConvertBitmapSource to convert */ + ERR("format %s unsupported\n", debugstr_guid(&guid)); + return E_FAIL; + } + + if (This->xres == 0.0 || This->yres == 0.0) + { + double xres, yres; + hr = IWICBitmapSource_GetResolution(pIBitmapSource, &xres, &yres); + if (FAILED(hr)) return hr; + hr = IWICBitmapFrameEncode_SetResolution(iface, xres, yres); + if (FAILED(hr)) return hr; + } + + if (!prc) + { + UINT width, height; + hr = IWICBitmapSource_GetSize(pIBitmapSource, &width, &height); + if (FAILED(hr)) return hr; + rc.X = 0; + rc.Y = 0; + rc.Width = width; + rc.Height = height; + prc = &rc; + } + + if (prc->Width != This->width) return E_INVALIDARG; + + stride = (This->format->bpp * This->width + 7)/8; + + pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); + if (!pixeldata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(pIBitmapSource, prc, stride, + stride*prc->Height, pixeldata); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride, + stride*prc->Height, pixeldata); + } + + HeapFree(GetProcessHeap(), 0, pixeldata); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_Commit(IWICBitmapFrameEncode *iface)

1 0

Vincent Povirk : windowscodecs: Implement TiffFrameEncode_WritePixels.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 518f4fd6de5578fe09f976d64ab29e070f8e659f URL: http://source.winehq.org/git/wine.git/?a=commit;h=518f4fd6de5578fe09f976d64… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 15:55:16 2011 -0500 windowscodecs: Implement TiffFrameEncode_WritePixels. --- dlls/windowscodecs/tiffformat.c | 95 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index a44e80e..0968a42 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -64,7 +64,9 @@ MAKE_FUNCPTR(TIFFReadDirectory); MAKE_FUNCPTR(TIFFReadEncodedStrip); MAKE_FUNCPTR(TIFFReadEncodedTile); MAKE_FUNCPTR(TIFFSetDirectory); +MAKE_FUNCPTR(TIFFSetField); MAKE_FUNCPTR(TIFFWriteDirectory); +MAKE_FUNCPTR(TIFFWriteScanline); #undef MAKE_FUNCPTR static void *load_libtiff(void) @@ -93,7 +95,9 @@ static void *load_libtiff(void) LOAD_FUNCPTR(TIFFReadEncodedStrip); LOAD_FUNCPTR(TIFFReadEncodedTile); LOAD_FUNCPTR(TIFFSetDirectory); + LOAD_FUNCPTR(TIFFSetField); LOAD_FUNCPTR(TIFFWriteDirectory); + LOAD_FUNCPTR(TIFFWriteScanline); #undef LOAD_FUNCPTR } @@ -1166,6 +1170,7 @@ typedef struct TiffFrameEncode { const struct tiff_encode_format *format; UINT width, height; double xres, yres; + UINT lines_written; } TiffFrameEncode; static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) @@ -1343,8 +1348,93 @@ static HRESULT WINAPI TiffFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) { - FIXME("(%p,%u,%u,%u,%p): stub\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + BYTE *row_data, *swapped_data = NULL; + UINT i, j, line_size; + + TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); + + EnterCriticalSection(&This->parent->lock); + + if (!This->initialized || !This->width || !This->height || !This->format) + { + LeaveCriticalSection(&This->parent->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + if (lineCount == 0 || lineCount + This->lines_written > This->height) + { + LeaveCriticalSection(&This->parent->lock); + return E_INVALIDARG; + } + + line_size = ((This->width * This->format->bpp)+7)/8; + + if (This->format->reverse_bgr) + { + swapped_data = HeapAlloc(GetProcessHeap(), 0, line_size); + if (!swapped_data) + { + LeaveCriticalSection(&This->parent->lock); + return E_OUTOFMEMORY; + } + } + + if (!This->info_written) + { + pTIFFSetField(This->parent->tiff, TIFFTAG_PHOTOMETRIC, (uint16)This->format->photometric); + pTIFFSetField(This->parent->tiff, TIFFTAG_PLANARCONFIG, (uint16)1); + pTIFFSetField(This->parent->tiff, TIFFTAG_BITSPERSAMPLE, (uint16)This->format->bps); + pTIFFSetField(This->parent->tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16)This->format->samples); + + if (This->format->extra_sample) + { + uint16 extra_samples; + extra_samples = This->format->extra_sample_type; + + pTIFFSetField(This->parent->tiff, TIFFTAG_EXTRASAMPLES, (uint16)1, &extra_samples); + } + + pTIFFSetField(This->parent->tiff, TIFFTAG_IMAGEWIDTH, (uint32)This->width); + pTIFFSetField(This->parent->tiff, TIFFTAG_IMAGELENGTH, (uint32)This->height); + + if (This->xres != 0.0 && This->yres != 0.0) + { + pTIFFSetField(This->parent->tiff, TIFFTAG_RESOLUTIONUNIT, (uint16)2); /* Inch */ + pTIFFSetField(This->parent->tiff, TIFFTAG_XRESOLUTION, (float)This->xres); + pTIFFSetField(This->parent->tiff, TIFFTAG_YRESOLUTION, (float)This->yres); + } + + This->info_written = TRUE; + } + + for (i=0; i<lineCount; i++) + { + row_data = pbPixels + i * cbStride; + + if (This->format->reverse_bgr && This->format->bps == 8) + { + memcpy(swapped_data, row_data, line_size); + for (j=0; j<line_size; j += This->format->samples) + { + BYTE temp; + temp = swapped_data[j]; + swapped_data[j] = swapped_data[j+2]; + swapped_data[j+2] = temp; + } + row_data = swapped_data; + } + + pTIFFWriteScanline(This->parent->tiff, (tdata_t)row_data, i+This->lines_written, 0); + } + + This->lines_written += lineCount; + + LeaveCriticalSection(&This->parent->lock); + + HeapFree(GetProcessHeap(), 0, swapped_data); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, @@ -1549,6 +1639,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, result->height = 0; result->xres = 0.0; result->yres = 0.0; + result->lines_written = 0; IWICBitmapEncoder_AddRef(iface); *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface;

1 0

Vincent Povirk : windowscodecs: Implement TiffFrameEncode_SetResolution.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 28fc658da81b06827381b247d84699aa0f7a2809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28fc658da81b06827381b247d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 14:37:05 2011 -0500 windowscodecs: Implement TiffFrameEncode_SetResolution. --- dlls/windowscodecs/tiffformat.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 22e9912..a44e80e 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1165,6 +1165,7 @@ typedef struct TiffFrameEncode { BOOL info_written; const struct tiff_encode_format *format; UINT width, height; + double xres, yres; } TiffFrameEncode; static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) @@ -1267,8 +1268,23 @@ static HRESULT WINAPI TiffFrameEncode_SetSize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI TiffFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, double dpiX, double dpiY) { - FIXME("(%p,%0.2f,%0.2f): stub\n", iface, dpiX, dpiY); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); + + EnterCriticalSection(&This->parent->lock); + + if (!This->initialized || This->info_written) + { + LeaveCriticalSection(&This->parent->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + This->xres = dpiX; + This->yres = dpiY; + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, @@ -1531,6 +1547,8 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, result->format = NULL; result->width = 0; result->height = 0; + result->xres = 0.0; + result->yres = 0.0; IWICBitmapEncoder_AddRef(iface); *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface;

1 0

Vincent Povirk : windowscodecs: Implement TiffFrameEncode_SetSize.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: eaf61d8361a5a05b7d03a69f17a837640c1a5316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf61d8361a5a05b7d03a69f1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 12:15:42 2011 -0500 windowscodecs: Implement TiffFrameEncode_SetSize. --- dlls/windowscodecs/tiffformat.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 52dcf3c..22e9912 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1164,6 +1164,7 @@ typedef struct TiffFrameEncode { BOOL initialized; BOOL info_written; const struct tiff_encode_format *format; + UINT width, height; } TiffFrameEncode; static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) @@ -1244,8 +1245,23 @@ static HRESULT WINAPI TiffFrameEncode_Initialize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI TiffFrameEncode_SetSize(IWICBitmapFrameEncode *iface, UINT uiWidth, UINT uiHeight) { - FIXME("(%p,%u,%u): stub\n", iface, uiWidth, uiHeight); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); + + EnterCriticalSection(&This->parent->lock); + + if (!This->initialized || This->info_written) + { + LeaveCriticalSection(&This->parent->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + This->width = uiWidth; + This->height = uiHeight; + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, @@ -1513,6 +1529,8 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, result->initialized = FALSE; result->info_written = FALSE; result->format = NULL; + result->width = 0; + result->height = 0; IWICBitmapEncoder_AddRef(iface); *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface;

1 0

Vincent Povirk : windowscodecs: Implement TiffFrameEncode_SetPixelFormat.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 3c8edfe9dc823780157b7f8d79b2424a467fbb3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c8edfe9dc823780157b7f8d7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 12:09:25 2011 -0500 windowscodecs: Implement TiffFrameEncode_SetPixelFormat. --- dlls/windowscodecs/tiffformat.c | 57 +++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 65a65a5..52dcf3c 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1116,6 +1116,30 @@ HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return ret; } +struct tiff_encode_format { + const WICPixelFormatGUID *guid; + int photometric; + int bps; + int samples; + int bpp; + int extra_sample; + int extra_sample_type; + int reverse_bgr; +}; + +static const struct tiff_encode_format formats[] = { + {&GUID_WICPixelFormat24bppBGR, 2, 8, 3, 24, 0, 0, 1}, + {&GUID_WICPixelFormatBlackWhite, 1, 1, 1, 1, 0, 0, 0}, + {&GUID_WICPixelFormat4bppGray, 1, 4, 1, 4, 0, 0, 0}, + {&GUID_WICPixelFormat8bppGray, 1, 8, 1, 8, 0, 0, 0}, + {&GUID_WICPixelFormat32bppBGRA, 2, 8, 4, 32, 1, 2, 1}, + {&GUID_WICPixelFormat32bppPBGRA, 2, 8, 4, 32, 1, 1, 1}, + {&GUID_WICPixelFormat48bppRGB, 2, 16, 3, 48, 0, 0, 0}, + {&GUID_WICPixelFormat64bppRGBA, 2, 16, 4, 64, 1, 2, 0}, + {&GUID_WICPixelFormat64bppPRGBA, 2, 16, 4, 64, 1, 1, 0}, + {0} +}; + typedef struct TiffEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; LONG ref; @@ -1138,6 +1162,8 @@ typedef struct TiffFrameEncode { TiffEncoder *parent; /* fields below are protected by parent->lock */ BOOL initialized; + BOOL info_written; + const struct tiff_encode_format *format; } TiffFrameEncode; static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) @@ -1232,8 +1258,33 @@ static HRESULT WINAPI TiffFrameEncode_SetResolution(IWICBitmapFrameEncode *iface static HRESULT WINAPI TiffFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + int i; + + TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); + + EnterCriticalSection(&This->parent->lock); + + if (!This->initialized || This->info_written) + { + LeaveCriticalSection(&This->parent->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + for (i=0; formats[i].guid; i++) + { + if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + break; + } + + if (!formats[i].guid) i = 0; + + This->format = &formats[i]; + memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_SetColorContexts(IWICBitmapFrameEncode *iface, @@ -1460,6 +1511,8 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, result->ref = 1; result->parent = This; result->initialized = FALSE; + result->info_written = FALSE; + result->format = NULL; IWICBitmapEncoder_AddRef(iface); *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface;

1 0

Henri Verbeet : wined3d: Rename "NumberOfSwapChains" to "swapchain_count".
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: fb4c7e9f9b8caaec1770687c68fbac58393df302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4c7e9f9b8caaec1770687c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:17:53 2011 +0200 wined3d: Rename "NumberOfSwapChains" to "swapchain_count". --- dlls/wined3d/device.c | 38 +++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3569f94..44b81c4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1308,19 +1308,22 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, return WINED3D_OK; } -/** NOTE: These are ahead of the other getters and setters to save using a forward declaration **/ -static UINT WINAPI IWineD3DDeviceImpl_GetNumberOfSwapChains(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("(%p)\n", This); +static UINT WINAPI IWineD3DDeviceImpl_GetNumberOfSwapChains(IWineD3DDevice *iface) +{ + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; - return This->NumberOfSwapChains; + TRACE("iface %p.\n", iface); + + return device->swapchain_count; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetSwapChain(IWineD3DDevice *iface, UINT iSwapChain, IWineD3DSwapChain **pSwapChain) { +static HRESULT WINAPI IWineD3DDeviceImpl_GetSwapChain(IWineD3DDevice *iface, + UINT iSwapChain, IWineD3DSwapChain **pSwapChain) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : swapchain %d\n", This, iSwapChain); - if (iSwapChain < This->NumberOfSwapChains) + if (iSwapChain < This->swapchain_count) { *pSwapChain = (IWineD3DSwapChain *)This->swapchains[iSwapChain]; IWineD3DSwapChain_AddRef(*pSwapChain); @@ -1955,8 +1958,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, goto err_out; } - This->NumberOfSwapChains = 1; - This->swapchains = HeapAlloc(GetProcessHeap(), 0, This->NumberOfSwapChains * sizeof(*This->swapchains)); + This->swapchain_count = 1; + This->swapchains = HeapAlloc(GetProcessHeap(), 0, This->swapchain_count * sizeof(*This->swapchains)); if (!This->swapchains) { ERR("Out of memory!\n"); @@ -2054,8 +2057,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, err_out: HeapFree(GetProcessHeap(), 0, This->render_targets); HeapFree(GetProcessHeap(), 0, This->swapchains); - This->NumberOfSwapChains = 0; - if(This->palettes) { + This->swapchain_count = 0; + if (This->palettes) + { HeapFree(GetProcessHeap(), 0, This->palettes[0]); HeapFree(GetProcessHeap(), 0, This->palettes); } @@ -2098,8 +2102,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_InitGDI(IWineD3DDevice *iface, goto err_out; } - This->NumberOfSwapChains = 1; - This->swapchains = HeapAlloc(GetProcessHeap(), 0, This->NumberOfSwapChains * sizeof(*This->swapchains)); + This->swapchain_count = 1; + This->swapchains = HeapAlloc(GetProcessHeap(), 0, This->swapchain_count * sizeof(*This->swapchains)); if (!This->swapchains) { ERR("Out of memory!\n"); @@ -2259,7 +2263,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, context_release(context); - for (i = 0; i < This->NumberOfSwapChains; ++i) + for (i = 0; i < This->swapchain_count; ++i) { TRACE("Releasing the implicit swapchain %u.\n", i); if (D3DCB_DestroySwapChain((IWineD3DSwapChain *)This->swapchains[i]) > 0) @@ -2270,7 +2274,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, HeapFree(GetProcessHeap(), 0, This->swapchains); This->swapchains = NULL; - This->NumberOfSwapChains = 0; + This->swapchain_count = 0; for (i = 0; i < This->palette_count; ++i) HeapFree(GetProcessHeap(), 0, This->palettes[i]); @@ -2290,7 +2294,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UninitGDI(IWineD3DDevice *iface, D3DCB_ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; unsigned int i; - for (i = 0; i < This->NumberOfSwapChains; ++i) + for (i = 0; i < This->swapchain_count; ++i) { TRACE("Releasing the implicit swapchain %u.\n", i); if (D3DCB_DestroySwapChain((IWineD3DSwapChain *)This->swapchains[i]) > 0) @@ -2301,7 +2305,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UninitGDI(IWineD3DDevice *iface, D3DCB_ HeapFree(GetProcessHeap(), 0, This->swapchains); This->swapchains = NULL; - This->NumberOfSwapChains = 0; + This->swapchain_count = 0; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a9e4ae..47d8631 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1708,7 +1708,7 @@ struct IWineD3DDeviceImpl HWND focus_window; IWineD3DSwapChainImpl **swapchains; - UINT NumberOfSwapChains; + UINT swapchain_count; struct list resources; /* a linked list to track resources created by the device */ struct list shaders; /* a linked list to track shaders (pixel and vertex) */

1 0

Henri Verbeet : wined3d: Rename "NumberOfPalettes" to "palette_count".
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 55555319505cddafa5a016e323c09b46444062b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55555319505cddafa5a016e32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:17:52 2011 +0200 wined3d: Rename "NumberOfPalettes" to "palette_count". --- dlls/wined3d/device.c | 41 +++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 6 ++-- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e91a078..3569f94 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1910,7 +1910,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, This->render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->render_targets) * gl_info->limits.buffers); - This->NumberOfPalettes = 1; + This->palette_count = 1; This->palettes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PALETTEENTRY*)); if (!This->palettes || !This->render_targets) { @@ -2059,8 +2059,9 @@ err_out: HeapFree(GetProcessHeap(), 0, This->palettes[0]); HeapFree(GetProcessHeap(), 0, This->palettes); } - This->NumberOfPalettes = 0; - if(swapchain) { + This->palette_count = 0; + if (swapchain) + { IWineD3DSwapChain_Release( (IWineD3DSwapChain *) swapchain); } if (This->stateBlock) @@ -2271,10 +2272,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, This->swapchains = NULL; This->NumberOfSwapChains = 0; - for (i = 0; i < This->NumberOfPalettes; i++) HeapFree(GetProcessHeap(), 0, This->palettes[i]); + for (i = 0; i < This->palette_count; ++i) + HeapFree(GetProcessHeap(), 0, This->palettes[i]); HeapFree(GetProcessHeap(), 0, This->palettes); This->palettes = NULL; - This->NumberOfPalettes = 0; + This->palette_count = 0; HeapFree(GetProcessHeap(), 0, This->render_targets); This->render_targets = NULL; @@ -5319,7 +5321,9 @@ static void dirtify_p8_texture_samplers(IWineD3DDeviceImpl *device) } } -static HRESULT WINAPI IWineD3DDeviceImpl_SetPaletteEntries(IWineD3DDevice *iface, UINT PaletteNumber, CONST PALETTEENTRY* pEntries) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetPaletteEntries(IWineD3DDevice *iface, + UINT PaletteNumber, const PALETTEENTRY *pEntries) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; int j; UINT NewSize; @@ -5332,8 +5336,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPaletteEntries(IWineD3DDevice *ifa return WINED3DERR_INVALIDCALL; } - if (PaletteNumber >= This->NumberOfPalettes) { - NewSize = This->NumberOfPalettes; + if (PaletteNumber >= This->palette_count) + { + NewSize = This->palette_count; do { NewSize *= 2; } while(PaletteNumber >= NewSize); @@ -5343,7 +5348,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPaletteEntries(IWineD3DDevice *ifa return E_OUTOFMEMORY; } This->palettes = palettes; - This->NumberOfPalettes = NewSize; + This->palette_count = NewSize; } if (!This->palettes[PaletteNumber]) { @@ -5365,14 +5370,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPaletteEntries(IWineD3DDevice *ifa return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetPaletteEntries(IWineD3DDevice *iface, UINT PaletteNumber, PALETTEENTRY* pEntries) { +static HRESULT WINAPI IWineD3DDeviceImpl_GetPaletteEntries(IWineD3DDevice *iface, + UINT PaletteNumber, PALETTEENTRY *pEntries) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; int j; TRACE("(%p) : PaletteNumber %u\n", This, PaletteNumber); - if (PaletteNumber >= This->NumberOfPalettes || !This->palettes[PaletteNumber]) { + + if (PaletteNumber >= This->palette_count || !This->palettes[PaletteNumber]) + { /* What happens in such situation isn't documented; Native seems to silently abort on such conditions. Return Invalid Call. */ - ERR("(%p) : (%u) Nonexistent palette. NumberOfPalettes %u\n", This, PaletteNumber, This->NumberOfPalettes); + ERR("(%p) : (%u) Nonexistent palette. Palette count %u.\n", This, PaletteNumber, This->palette_count); return WINED3DERR_INVALIDCALL; } for (j = 0; j < 256; ++j) { @@ -5385,13 +5394,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPaletteEntries(IWineD3DDevice *ifa return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_SetCurrentTexturePalette(IWineD3DDevice *iface, UINT PaletteNumber) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetCurrentTexturePalette(IWineD3DDevice *iface, UINT PaletteNumber) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : PaletteNumber %u\n", This, PaletteNumber); /* Native appears to silently abort on attempt to make an uninitialized palette current and render. (tested with reference rasterizer). Return Invalid Call. */ - if (PaletteNumber >= This->NumberOfPalettes || !This->palettes[PaletteNumber]) { - ERR("(%p) : (%u) Nonexistent palette. NumberOfPalettes %u\n", This, PaletteNumber, This->NumberOfPalettes); + if (PaletteNumber >= This->palette_count || !This->palettes[PaletteNumber]) + { + ERR("(%p) : (%u) Nonexistent palette. Palette count %u.\n", This, PaletteNumber, This->palette_count); return WINED3DERR_INVALIDCALL; } /*TODO: stateblocks */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 992ede4..1a9e4ae 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1721,9 +1721,9 @@ struct IWineD3DDeviceImpl IWineD3DSurfaceImpl *depth_stencil; /* palettes texture management */ - UINT NumberOfPalettes; - PALETTEENTRY **palettes; - UINT currentPalette; + PALETTEENTRY **palettes; + UINT palette_count; + UINT currentPalette; /* For rendering to a texture using glCopyTexImage */ GLuint depth_blt_texture;

1 0

Henri Verbeet : wined3d: Don' t unregister windows with the wrong window proc on unload either.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 9d405473d091ee7e8f9319cbaf4d35146c982ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d405473d091ee7e8f9319cba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:17:51 2011 +0200 wined3d: Don't unregister windows with the wrong window proc on unload either. This is the same issue as 7a354177b38c9451c938389576890a14d5c543fa, just on wined3d unload this time. --- dlls/wined3d/wined3d_main.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 532314c..63cc677 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -355,8 +355,13 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) for (i = 0; i < wndproc_table.count; ++i) { - struct wined3d_wndproc *entry = &wndproc_table.entries[i]; - SetWindowLongPtrW(entry->window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + /* Trying to unregister these would be futile. These entries can only + * exist if either we skipped them in wined3d_unregister_window() due + * to the application replacing the wndproc after the entry was + * registered, or if the application still has an active wined3d + * device. In the latter case the application has bigger problems than + * these entries. */ + WARN("Leftover wndproc table entry %p.\n", &wndproc_table.entries[i]); } HeapFree(GetProcessHeap(), 0, wndproc_table.entries);

1 0

Henri Verbeet : d3d9/tests: Add a depth blit test.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 86d090ee8e7456522a8244136bdfedd4f15c835e URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d090ee8e7456522a8244136… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:17:50 2011 +0200 d3d9/tests: Add a depth blit test. --- dlls/d3d9/tests/visual.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2a31c5c..baf8243 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10927,6 +10927,133 @@ static void depth_buffer2_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); } +static void depth_blit_test(IDirect3DDevice9 *device) +{ + static const struct vertex quad1[] = + { + { -1.0, 1.0, 0.50f, 0xff00ff00}, + { 1.0, 1.0, 0.50f, 0xff00ff00}, + { -1.0, -1.0, 0.50f, 0xff00ff00}, + { 1.0, -1.0, 0.50f, 0xff00ff00}, + }; + static const struct vertex quad2[] = + { + { -1.0, 1.0, 0.66f, 0xff0000ff}, + { 1.0, 1.0, 0.66f, 0xff0000ff}, + { -1.0, -1.0, 0.66f, 0xff0000ff}, + { 1.0, -1.0, 0.66f, 0xff0000ff}, + }; + static const DWORD expected_colors[4][4] = + { + {0x000000ff, 0x000000ff, 0x0000ff00, 0x00ff0000}, + {0x000000ff, 0x000000ff, 0x0000ff00, 0x00ff0000}, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x00ff0000}, + {0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000}, + }; + + IDirect3DSurface9 *backbuffer, *ds1, *ds2; + RECT src_rect, dst_rect; + unsigned int i, j; + D3DVIEWPORT9 vp; + D3DCOLOR color; + HRESULT hr; + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 480; + vp.MinZ = 0.0; + vp.MaxZ = 1.0; + + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &backbuffer); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &ds1); + ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, 0, 0, FALSE, &ds2, NULL); + ok(SUCCEEDED(hr), "CreateDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds2); + ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState 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_LESSEQUAL); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + SetRect(&dst_rect, 0, 0, 480, 360); + hr = IDirect3DDevice9_Clear(device, 1, (D3DRECT *)&dst_rect, D3DCLEAR_ZBUFFER, 0, 0.5f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + SetRect(&dst_rect, 0, 0, 320, 240); + hr = IDirect3DDevice9_Clear(device, 1, (D3DRECT *)&dst_rect, D3DCLEAR_ZBUFFER, 0, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + /* Partial blit. */ + SetRect(&src_rect, 0, 0, 320, 240); + SetRect(&dst_rect, 0, 0, 320, 240); + hr = IDirect3DDevice9_StretchRect(device, ds2, &src_rect, ds1, &dst_rect, D3DTEXF_POINT); + ok(hr == D3DERR_INVALIDCALL, "StretchRect returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Flipped. */ + SetRect(&src_rect, 0, 0, 640, 480); + SetRect(&dst_rect, 0, 480, 640, 0); + hr = IDirect3DDevice9_StretchRect(device, ds2, &src_rect, ds1, &dst_rect, D3DTEXF_POINT); + ok(hr == D3DERR_INVALIDCALL, "StretchRect returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Full, explicit. */ + SetRect(&src_rect, 0, 0, 640, 480); + SetRect(&dst_rect, 0, 0, 640, 480); + hr = IDirect3DDevice9_StretchRect(device, ds2, &src_rect, ds1, &dst_rect, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr); + /* Filtered blit. */ + hr = IDirect3DDevice9_StretchRect(device, ds2, NULL, ds1, NULL, D3DTEXF_LINEAR); + ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr); + /* Depth -> color blit.*/ + hr = IDirect3DDevice9_StretchRect(device, ds2, NULL, backbuffer, NULL, D3DTEXF_POINT); + ok(hr == D3DERR_INVALIDCALL, "StretchRect returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + IDirect3DSurface9_Release(backbuffer); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds1); + ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER | D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_StretchRect(device, ds2, NULL, ds1, NULL, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds2); + IDirect3DSurface9_Release(ds1); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, FALSE); + ok(SUCCEEDED(hr), "SetRenderState 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, quad1, sizeof(*quad1)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + 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 < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + unsigned int x = 80 * ((2 * j) + 1); + unsigned int y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, expected_colors[i][j], 0), + "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected_colors[i][j], x, y, color); + } + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); +} + static void intz_test(IDirect3DDevice9 *device) { static const DWORD ps_code[] = @@ -12027,6 +12154,7 @@ START_TEST(visual) dp3_alpha_test(device_ptr); depth_buffer_test(device_ptr); depth_buffer2_test(device_ptr); + depth_blit_test(device_ptr); intz_test(device_ptr); shadow_test(device_ptr); fp_special_test(device_ptr);

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011