May 2012 - Wine-Commits - list.winehq.org

Michael Stefaniuc : version/tests: Check the correct variable.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: d8bc01848784fc6e25733321121a5899147de3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8bc01848784fc6e257333211… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 15 10:12:39 2012 +0200 version/tests: Check the correct variable. --- dlls/version/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index e689017..e3e5c90 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -412,7 +412,7 @@ static void test_32bit_win(void) retW = VerQueryValueW( pVersionInfoW, rootW, (LPVOID *)&pBufW, &uiLengthW ); ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); - ok ( uiLengthA == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthA); + ok ( uiLengthW == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthW ); ok( uiLengthA == uiLengthW, "The size of VS_FIXEDFILEINFO should be the same for both A/W calls, it is (%d) vs. (%d)\n", uiLengthA, uiLengthW);

1 0

Andrew Eikum : dsound: Resample to float, not device format.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: 98c653bc8bc842e23b3fa9098d2cbf5e0e8c348a URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c653bc8bc842e23b3fa9098… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 15 08:29:34 2012 -0500 dsound: Resample to float, not device format. --- dlls/dsound/dsound_convert.c | 92 +++------------------------------ dlls/dsound/dsound_private.h | 9 +-- dlls/dsound/mixer.c | 118 ++++++++++++++++-------------------------- dlls/dsound/primary.c | 15 ++---- 4 files changed, 59 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98c653bc8bc842e23b3fa…

1 0

Andrew Eikum : dsound: Get rid of redundant primary_mixpos member.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: 5cce1d9da2eba0b76c1ea4a1b12f0dff70324ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cce1d9da2eba0b76c1ea4a1b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 14 15:19:50 2012 -0500 dsound: Get rid of redundant primary_mixpos member. --- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 60 ++++++++++-------------------------------- dlls/dsound/primary.c | 1 - 3 files changed, 15 insertions(+), 48 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index ba310db..375abac 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -186,7 +186,7 @@ struct IDirectSoundBufferImpl DWORD firstep; float freqAcc, freqAdjust, firgain; /* used for mixing */ - DWORD primary_mixpos, sec_mixpos; + DWORD sec_mixpos; /* IDirectSoundNotify fields */ LPDSBPOSITIONNOTIFY notifies; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 625665f..a940a85 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -520,10 +520,6 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO DSOUND_CheckEvent(dsb, oldpos, ilen); } - /* increase mix position */ - dsb->primary_mixpos += len; - dsb->primary_mixpos %= dsb->device->buflen; - return len; } @@ -541,55 +537,34 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO */ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mixlen) { - /* The buffer's primary_mixpos may be before or after the device - * buffer's mixpos, but both must be ahead of writepos. */ - DWORD primary_done; + DWORD primary_done = 0; TRACE("(%p,%d,%d)\n",dsb,writepos,mixlen); - TRACE("writepos=%d, primary_mixpos=%d, mixlen=%d\n", writepos, dsb->primary_mixpos, mixlen); + TRACE("writepos=%d, mixlen=%d\n", writepos, mixlen); TRACE("looping=%d, leadin=%d\n", dsb->playflags, dsb->leadin); /* If leading in, only mix about 20 ms, and 'skip' mixing the rest, for more fluid pointer advancement */ - if (dsb->leadin && dsb->state == STATE_STARTING) - { - if (mixlen > 2 * dsb->device->fraglen) - { - dsb->primary_mixpos += mixlen - 2 * dsb->device->fraglen; - dsb->primary_mixpos %= dsb->device->buflen; + /* FIXME: Is this needed? */ + if (dsb->leadin && dsb->state == STATE_STARTING) { + if (mixlen > 2 * dsb->device->fraglen) { + primary_done = mixlen - 2 * dsb->device->fraglen; + mixlen = 2 * dsb->device->fraglen; + writepos += primary_done; + dsb->sec_mixpos += (primary_done / dsb->device->pwfx->nBlockAlign) * + dsb->pwfx->nBlockAlign * dsb->freqAdjust; } } - dsb->leadin = FALSE; - /* calculate how much pre-buffering has already been done for this buffer */ - primary_done = DSOUND_BufPtrDiff(dsb->device->buflen, dsb->primary_mixpos, writepos); - - /* sanity */ - if(mixlen < primary_done) - { - /* Should *NEVER* happen */ - ERR("Fatal error. Under/Overflow? primary_done=%d, mixpos=%d/%d, primary_mixpos=%d, writepos=%d, mixlen=%d\n", primary_done,dsb->sec_mixpos, dsb->buflen, dsb->primary_mixpos, writepos, mixlen); - dsb->primary_mixpos = writepos + mixlen; - dsb->primary_mixpos %= dsb->device->buflen; - return mixlen; - } - - /* take into account already mixed data */ - mixlen -= primary_done; - - TRACE("primary_done=%d, mixlen (primary) = %i\n", primary_done, mixlen); + dsb->leadin = FALSE; - if (!mixlen) - return primary_done; + TRACE("mixlen (primary) = %i\n", mixlen); /* First try to mix to the end of the buffer if possible * Theoretically it would allow for better optimization */ - DSOUND_MixInBuffer(dsb, dsb->primary_mixpos, mixlen); + primary_done += DSOUND_MixInBuffer(dsb, writepos, mixlen); - /* re-calculate the primary done */ - primary_done = DSOUND_BufPtrDiff(dsb->device->buflen, dsb->primary_mixpos, writepos); - - TRACE("new primary_mixpos=%d, total mixed data=%d\n", dsb->primary_mixpos, primary_done); + TRACE("total mixed data=%d\n", primary_done); /* Report back the total prebuffered amount for this buffer */ return primary_done; @@ -632,11 +607,6 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, DSOUND_CheckEvent(dsb, 0, 0); } else if (dsb->state != STATE_STOPPED) { - /* if recovering, reset the mix position */ - if ((dsb->state == STATE_STARTING) || recover) { - dsb->primary_mixpos = writepos; - } - /* if the buffer was starting, it must be playing now */ if (dsb->state == STATE_STARTING) dsb->state = STATE_PLAYING; @@ -806,8 +776,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* calc maximum prebuff */ prebuff_max = (device->prebuf * device->fraglen); - if (playpos + prebuff_max >= device->helfrags * device->fraglen) - prebuff_max += device->buflen - device->helfrags * device->fraglen; /* check how close we are to an underrun. It occurs when the writepos overtakes the mixpos */ prebuff_left = DSOUND_BufPtrDiff(device->buflen, device->mixpos, playpos); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 0d57f6f..ff79a70 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -537,7 +537,6 @@ opened: (*dsb)->freqAdjust = (*dsb)->freq / (float)device->pwfx->nSamplesPerSec; DSOUND_RecalcFormat((*dsb)); - (*dsb)->primary_mixpos = 0; RtlReleaseResource(&(*dsb)->lock); /* **** */

1 0

Andrew Eikum : dsound: Change mix_buffer to float instead of INT.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: e0ccd9e399db56a11dd21b0c767eb9abd48e9d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ccd9e399db56a11dd21b0c7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 14 15:19:46 2012 -0500 dsound: Change mix_buffer to float instead of INT. --- dlls/dsound/dsound_convert.c | 157 +++++++++++++++++++++++------------------- dlls/dsound/dsound_private.h | 4 +- dlls/dsound/primary.c | 26 ++++++- 3 files changed, 111 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0ccd9e399db56a11dd21…

1 0

Lucas Fialho Zawacki : Added Portuguese translation for release 1.5.4
by Jeremy Newman May 14, 2012

May 14, 2012

Module: website Branch: master Commit: 51a34ed22decb6a0a2eb44c551b57dd414e52133 URL: http://source.winehq.org/git/website.git/?a=commit;h=51a34ed22decb6a0a2eb44… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Mon May 14 14:01:56 2012 -0300 Added Portuguese translation for release 1.5.4 --- news/pt/2012051101.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pt/2012051101.xml b/news/pt/2012051101.xml new file mode 100644 index 0000000..5e45413 --- /dev/null +++ b/news/pt/2012051101.xml @@ -0,0 +1,17 @@ +<news> +<date>11 de Maio de 2012</date> +<title>Wine 1.5.4 lançado</title> +<body> + A versão de desenvolvimento 1.5.4 já está disponível. + <a href="{$root}/announce/1.5.4">Novidades</a> desta versão: +<ul> + <li>Um novo resampler no DirectSound.</li> + <li>Um provedor de negociação de autenticação.</li> + <li>Suporte a OpenGL na engine DIB.</li> + <li>Suporte inicial a códigos mistos (mixed assemblies) com .NET.</li> + <li>Rotinas de suporte a Nomes de Domínio Internacionalizados.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.4.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads.</a>. +</body></news>

1 0

Józef Kucia : d3dx9: Add DDS support in D3DXLoadSurfaceFromFile functions.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 37ae580b84c1d2973716e99b00cbdb78b772e8e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ae580b84c1d2973716e99b0… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun May 13 23:00:08 2012 +0200 d3dx9: Add DDS support in D3DXLoadSurfaceFromFile functions. --- dlls/d3dx9_36/surface.c | 63 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 46 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ba8487d..ef4833f 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -377,8 +377,28 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG return D3D_OK; } +static HRESULT load_surface_from_dds(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, + const RECT *dst_rect, const void *src_data, const RECT *src_rect, DWORD filter, D3DCOLOR color_key, + const D3DXIMAGE_INFO *src_info) +{ + UINT size; + UINT src_pitch; + const struct dds_header *header = src_data; + const BYTE *pixels = (BYTE *)(header + 1); + + if (src_info->ResourceType != D3DRTYPE_TEXTURE) + return D3DXERR_INVALIDDATA; + + if (FAILED(calculate_dds_surface_size(src_info, src_info->Width, src_info->Height, &src_pitch, &size))) + return E_NOTIMPL; + + return D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, pixels, src_info->Format, + src_pitch, NULL, src_rect, filter, color_key); +} + HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) + { HRESULT hr; RECT src_rect; @@ -772,6 +792,32 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 pDestSurface, if (FAILED(hr)) return hr; + if (pSrcRect) + { + wicrect.X = pSrcRect->left; + wicrect.Y = pSrcRect->top; + wicrect.Width = pSrcRect->right - pSrcRect->left; + wicrect.Height = pSrcRect->bottom - pSrcRect->top; + } + else + { + wicrect.X = 0; + wicrect.Y = 0; + wicrect.Width = imginfo.Width; + wicrect.Height = imginfo.Height; + } + + SetRect(&rect, 0, 0, wicrect.Width, wicrect.Height); + + if (imginfo.ImageFileFormat == D3DXIFF_DDS) + { + hr = load_surface_from_dds(pDestSurface, pDestPalette, pDestRect, pSrcData, &rect, + dwFilter, Colorkey, &imginfo); + if (SUCCEEDED(hr) && pSrcInfo) + *pSrcInfo = imginfo; + return hr; + } + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if (FAILED(CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory))) @@ -798,23 +844,6 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 pDestSurface, if (FAILED(hr)) goto cleanup_bmp; - if (pSrcRect) - { - wicrect.X = pSrcRect->left; - wicrect.Y = pSrcRect->top; - wicrect.Width = pSrcRect->right - pSrcRect->left; - wicrect.Height = pSrcRect->bottom - pSrcRect->top; - } - else - { - wicrect.X = 0; - wicrect.Y = 0; - wicrect.Width = imginfo.Width; - wicrect.Height = imginfo.Height; - } - - SetRect(&rect, 0, 0, wicrect.Width, wicrect.Height); - formatdesc = get_format_info(imginfo.Format); if (formatdesc->format == D3DFMT_UNKNOWN)

1 0

Józef Kucia : d3dx9: Implement D3DXCreateCubeTextureFromFileInMemoryEx.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 69b94181f248754ca8601b733f449f8e8df3f41f URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b94181f248754ca8601b733… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun May 13 23:00:06 2012 +0200 d3dx9: Implement D3DXCreateCubeTextureFromFileInMemoryEx. --- dlls/d3dx9_36/d3dx9_36_private.h | 3 + dlls/d3dx9_36/surface.c | 56 +++++++++++++++ dlls/d3dx9_36/tests/texture.c | 46 ++++++------- dlls/d3dx9_36/texture.c | 137 ++++++++++++++++++++++++++++++++++++-- 4 files changed, 212 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69b94181f248754ca8601…

1 0

Austin English : msxml3: Avoid a dangling else (LLVM/Clang).
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 5de180beeb04aee97474e161bdf7b1f3362b4e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5de180beeb04aee97474e161b… Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 14 01:01:10 2012 -0500 msxml3: Avoid a dangling else (LLVM/Clang). --- dlls/msxml3/domdoc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 6805c75..5097ff6 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2277,8 +2277,7 @@ static HRESULT WINAPI domdoc_loadXML( /* skip leading spaces if needed */ if (This->properties->version == MSXML_DEFAULT || This->properties->version == MSXML26) - while (*ptr) - if (isspaceW(*ptr)) ptr++; else break; + while (*ptr && isspaceW(*ptr)) ptr++; xmldoc = doparse(This, (char*)ptr, strlenW(ptr)*sizeof(WCHAR), XML_CHAR_ENCODING_UTF16LE); if ( !xmldoc )

1 0

Józef Kucia : d3dx9/tests: Add tests for compressed pixel formats support in D3DXLoadSurface functions .
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: adc694b8316ca10aa63ebd9b64573b28f9b17e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc694b8316ca10aa63ebd9b6… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun May 13 23:00:09 2012 +0200 d3dx9/tests: Add tests for compressed pixel formats support in D3DXLoadSurface functions. --- dlls/d3dx9_36/tests/surface.c | 66 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 48b1c57..cb49ca3 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -839,6 +839,72 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_release((IUnknown*)surf, 0); } + /* DXT1, DXT2, DXT3, DXT4, DXT5 */ + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_R8G8B8, D3DPOOL_SYSTEMMEM, &surf, NULL); + if (FAILED(hr)) + skip("Failed to create R8G8B8 surface, hr %#x.\n", hr); + else + { + hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, dds_24bit, sizeof(dds_24bit), NULL, D3DX_FILTER_NONE, 0, NULL); + ok(SUCCEEDED(hr), "Failed to load surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT2, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + if (FAILED(hr)) + skip("Failed to create DXT2 surface, hr %#x.\n", hr); + else + { + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); + todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT2 format.\n"); + check_release((IUnknown*)newsurf, 0); + } + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT3, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + if (FAILED(hr)) + skip("Failed to create DXT3 surface, hr %#x.\n", hr); + else + { + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); + todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT3 format.\n"); + check_release((IUnknown*)newsurf, 0); + } + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT4, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + if (FAILED(hr)) + skip("Failed to create DXT4 surface, hr %#x.\n", hr); + else + { + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); + todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT4 format.\n"); + check_release((IUnknown*)newsurf, 0); + } + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT5, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + if (FAILED(hr)) + skip("Failed to create DXT5 surface, hr %#x.\n", hr); + else + { + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); + todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT5 format.\n"); + check_release((IUnknown*)newsurf, 0); + } + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT1, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + if (FAILED(hr)) + skip("Failed to create DXT1 surface, hr %#x.\n", hr); + else + { + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); + todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT1 format.\n"); + + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); + todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels from DXT1 format.\n"); + + check_release((IUnknown*)newsurf, 0); + } + + check_release((IUnknown*)surf, 0); + } + /* cleanup */ if(testdummy_ok) DeleteFileA("testdummy.bmp"); if(testbitmap_ok) DeleteFileA("testbitmap.bmp");

1 0

Józef Kucia : d3dx9: Add traces.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: b47c92bae323424308fd9be54a10d0af4c0365a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47c92bae323424308fd9be54… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun May 13 23:00:10 2012 +0200 d3dx9: Add traces. --- dlls/d3dx9_36/surface.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ef4833f..28975b9 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -334,6 +334,8 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG if (info->Format == D3DFMT_UNKNOWN) return D3DXERR_INVALIDDATA; + TRACE("Pixel format is %#x\n", info->Format); + if (header->caps2 & DDS_CAPS2_VOLUME) { info->Depth = header->depth; @@ -528,8 +530,10 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D if (!info) return D3D_OK; - if ((datasize >= 4) && !strncmp(data, "DDS ", 4)) + if ((datasize >= 4) && !strncmp(data, "DDS ", 4)) { + TRACE("File type is DDS\n"); return get_image_info_from_dds(data, datasize, info); + } initresult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);

1 0