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

Francois Gouget : wsock32: Fix the spelling of the XP_BANDWIDTH_ALLOCATION constant.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: dab51e062308260bfefab9f4cd0b899c39ab8c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab51e062308260bfefab9f4c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:46:29 2012 +0200 wsock32: Fix the spelling of the XP_BANDWIDTH_ALLOCATION constant. --- dlls/wsock32/protocol.c | 2 +- include/nspapi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c index 85cb54b..9482887 100644 --- a/dlls/wsock32/protocol.c +++ b/dlls/wsock32/protocol.c @@ -83,7 +83,7 @@ static DWORD map_service(DWORD wsaflags) if (wsaflags & XP1_DISCONNECT_DATA) flags |= XP_DISCONNECT_DATA; if (wsaflags & XP1_SUPPORT_BROADCAST) flags |= XP_SUPPORTS_BROADCAST; if (wsaflags & XP1_SUPPORT_MULTIPOINT) flags |= XP_SUPPORTS_MULTICAST; - if (wsaflags & XP1_QOS_SUPPORTED) flags |= XP_BANDWITH_ALLOCATION; + if (wsaflags & XP1_QOS_SUPPORTED) flags |= XP_BANDWIDTH_ALLOCATION; if (wsaflags & XP1_PARTIAL_MESSAGE) flags |= XP_FRAGMENTATION; return flags; } diff --git a/include/nspapi.h b/include/nspapi.h index a62f4d9..dc0e0f5 100644 --- a/include/nspapi.h +++ b/include/nspapi.h @@ -38,7 +38,7 @@ extern "C" { #define XP_DISCONNECT_DATA 0x00000100 #define XP_SUPPORTS_BROADCAST 0x00000200 #define XP_SUPPORTS_MULTICAST 0x00000400 -#define XP_BANDWITH_ALLOCATION 0x00000800 +#define XP_BANDWIDTH_ALLOCATION 0x00000800 #define XP_FRAGMENTATION 0x00001000 #define XP_ENCRYPTS 0x00002000

1 0

Francois Gouget : winedump: Fix the spelling of a NETWORK_VOLUME_INFO field .
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 61267a2bdc0516337146aff22f84c4d2b4cd4ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61267a2bdc0516337146aff22… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:46:45 2012 +0200 winedump: Fix the spelling of a NETWORK_VOLUME_INFO field. --- tools/winedump/lnk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index e0a2282..1a89173 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -138,7 +138,7 @@ typedef struct _LOCAL_VOLUME_INFO typedef struct _NETWORK_VOLUME_INFO { DWORD dwSize; - DWORD dwUnkown1; + DWORD dwUnknown1; DWORD dwShareNameOfs; DWORD dwReserved; DWORD dwUnknown2;

1 0

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

15 May '12

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

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

15 May '12

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

Lucas Fialho Zawacki : Added Portuguese translation for release 1.5.4
by Jeremy Newman 14 May '12

14 May '12

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: Forward D3DXCreateCubeTextureFromFile functions to D3DXCreateCubeTextureFromFileInMemoryEx .
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: f53ce18163678c5b3542afd5ef9fe70fc7b20938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53ce18163678c5b3542afd5e… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun May 13 23:00:05 2012 +0200 d3dx9: Forward D3DXCreateCubeTextureFromFile functions to D3DXCreateCubeTextureFromFileInMemoryEx. --- dlls/d3dx9_36/d3dx9_36.spec | 8 +- dlls/d3dx9_36/texture.c | 132 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 94893d3..aa2046a 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -35,12 +35,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stub D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stub D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stub D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stub D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 1606c9a..93ac533 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1088,6 +1088,138 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 pDevice return E_NOTIMPL; } +HRESULT WINAPI D3DXCreateCubeTextureFromFileA(IDirect3DDevice9 *device, + const char *src_filename, + IDirect3DCubeTexture9 **cube_texture) +{ + int len; + HRESULT hr; + WCHAR *filename; + void *data; + DWORD data_size; + + TRACE("(%p, %s, %p): relay\n", device, wine_dbgstr_a(src_filename), cube_texture); + + if (!src_filename) return D3DERR_INVALIDCALL; + + len = MultiByteToWideChar(CP_ACP, 0, src_filename, -1, NULL, 0); + filename = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!filename) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, src_filename, -1, filename, len); + + hr = map_view_of_file(filename, &data, &data_size); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, filename); + return D3DXERR_INVALIDDATA; + } + + hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, data, data_size, D3DX_DEFAULT, D3DX_DEFAULT, + 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, cube_texture); + + UnmapViewOfFile(data); + HeapFree(GetProcessHeap(), 0, filename); + return hr; +} + +HRESULT WINAPI D3DXCreateCubeTextureFromFileW(IDirect3DDevice9 *device, + const WCHAR *src_filename, + IDirect3DCubeTexture9 **cube_texture) +{ + HRESULT hr; + void *data; + DWORD data_size; + + TRACE("(%p, %s, %p): relay\n", device, wine_dbgstr_w(src_filename), cube_texture); + + hr = map_view_of_file(src_filename, &data, &data_size); + if (FAILED(hr)) return D3DXERR_INVALIDDATA; + + hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, data, data_size, D3DX_DEFAULT, D3DX_DEFAULT, + 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, cube_texture); + + UnmapViewOfFile(data); + return hr; +} + +HRESULT WINAPI D3DXCreateCubeTextureFromFileExA(IDirect3DDevice9 *device, + const char *src_filename, + UINT size, + UINT mip_levels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + DWORD filter, + DWORD mip_filter, + D3DCOLOR color_key, + D3DXIMAGE_INFO *image_info, + PALETTEENTRY *palette, + IDirect3DCubeTexture9 **cube_texture) +{ + int len; + HRESULT hr; + WCHAR *filename; + void *data; + DWORD data_size; + + TRACE("(%p, %s, %u, %u, %#x, %#x, %#x, %#x, %#x, %#x, %p, %p, %p): relay\n", + device, wine_dbgstr_a(src_filename), size, mip_levels, usage, format, + pool, filter, mip_filter, color_key, image_info, palette, cube_texture); + + if (!src_filename) return D3DERR_INVALIDCALL; + + len = MultiByteToWideChar(CP_ACP, 0, src_filename, -1, NULL, 0); + filename = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!filename) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, src_filename, -1, filename, len); + + hr = map_view_of_file(filename, &data, &data_size); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, filename); + return D3DXERR_INVALIDDATA; + } + + hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, data, data_size, size, mip_levels, + usage, format, pool, filter, mip_filter, color_key, image_info, palette, cube_texture); + + UnmapViewOfFile(data); + HeapFree(GetProcessHeap(), 0, filename); + return hr; +} + +HRESULT WINAPI D3DXCreateCubeTextureFromFileExW(IDirect3DDevice9 *device, + const WCHAR *src_filename, + UINT size, + UINT mip_levels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + DWORD filter, + DWORD mip_filter, + D3DCOLOR color_key, + D3DXIMAGE_INFO *image_info, + PALETTEENTRY *palette, + IDirect3DCubeTexture9 **cube_texture) +{ + HRESULT hr; + void *data; + DWORD data_size; + + TRACE("(%p, %s, %u, %u, %#x, %#x, %#x, %#x, %#x, %#x, %p, %p, %p): relay\n", + device, wine_dbgstr_w(src_filename), size, mip_levels, usage, format, + pool, filter, mip_filter, color_key, image_info, palette, cube_texture); + + hr = map_view_of_file(src_filename, &data, &data_size); + if (FAILED(hr)) return D3DXERR_INVALIDDATA; + + hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, data, data_size, size, mip_levels, + usage, format, pool, filter, mip_filter, color_key, image_info, palette, cube_texture); + + UnmapViewOfFile(data); + return hr; +} + enum cube_coord { XCOORD = 0,

1 0

Józef Kucia : d3dx9: Implement D3DXCreateCubeTextureFromFileInMemoryEx.
by Alexandre Julliard 14 May '12

14 May '12

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

Józef Kucia : d3dx9: Add DDS support in D3DXCreateTextureFromFile functions.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 97987bed7025436df0abe76842798d78b8e4e536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97987bed7025436df0abe7684… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun May 13 23:00:07 2012 +0200 d3dx9: Add DDS support in D3DXCreateTextureFromFile functions. --- dlls/d3dx9_36/d3dx9_36_private.h | 2 + dlls/d3dx9_36/surface.c | 41 +++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/texture.c | 44 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/texture.c | 23 ++++++++++++++++--- 4 files changed, 106 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 9405a0f..be460f2 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -62,6 +62,8 @@ HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, const PixelFormatDesc *get_format_info(D3DFORMAT format) DECLSPEC_HIDDEN; const PixelFormatDesc *get_format_info_idx(int idx) DECLSPEC_HIDDEN; +HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette, + DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ef4baef..ba8487d 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -377,6 +377,47 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG return D3D_OK; } +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; + UINT src_pitch; + UINT mip_level; + UINT mip_levels; + UINT mip_level_size; + UINT width, height; + IDirect3DSurface9 *surface; + const struct dds_header *header = src_data; + const BYTE *pixels = (BYTE *)(header + 1); + + if (src_info->ResourceType != D3DRTYPE_TEXTURE) + return D3DXERR_INVALIDDATA; + + width = src_info->Width; + height = src_info->Height; + mip_levels = min(src_info->MipLevels, IDirect3DTexture9_GetLevelCount(texture)); + for (mip_level = 0; mip_level < mip_levels; mip_level++) + { + hr = calculate_dds_surface_size(src_info, width, height, &src_pitch, &mip_level_size); + if (FAILED(hr)) return hr; + + SetRect(&src_rect, 0, 0, width, height); + + IDirect3DTexture9_GetSurfaceLevel(texture, mip_level, &surface); + hr = D3DXLoadSurfaceFromMemory(surface, palette, NULL, pixels, src_info->Format, src_pitch, + NULL, &src_rect, filter, color_key); + IDirect3DSurface9_Release(surface); + if (FAILED(hr)) return hr; + + pixels += mip_level_size; + width = max(1, width / 2); + height = max(1, height / 2); + } + + return D3D_OK; +} + HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info) { diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index f3422e6..60017ec 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -25,6 +25,32 @@ #include "d3dx9tex.h" #include "resources.h" +/* 2x2 16-bit dds, no mipmaps */ +static const unsigned char dds_16bit[] = { +0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x08,0x00,0x02,0x00,0x00,0x00, +0x02,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, +0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x7c,0x00,0x00, +0xe0,0x03,0x00,0x00,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0xff,0x7f,0xff,0x7f,0xff,0x7f,0xff,0x7f +}; + +/* 2x2 24-bit dds, 2 mipmaps */ +static const unsigned char dds_24bit[] = { +0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x0a,0x00,0x02,0x00,0x00,0x00, +0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, +0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0xff,0x00, +0x00,0xff,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x40,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff +}; + /* 4x4 cube map dds */ static const unsigned char dds_cube_map[] = { 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x08,0x00,0x04,0x00,0x00,0x00, @@ -1106,6 +1132,23 @@ static void test_D3DXFillVolumeTexture(IDirect3DDevice9 *device) IDirect3DVolumeTexture9_Release(tex); } +static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3DTexture9 *texture; + + hr = D3DXCreateTextureFromFileInMemory(device, dds_16bit, sizeof(dds_16bit), &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + + hr = D3DXCreateTextureFromFileInMemory(device, dds_24bit, sizeof(dds_24bit), &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + + hr = D3DXCreateTextureFromFileInMemory(device, dds_24bit, sizeof(dds_24bit) - 1, &texture); + ok(hr == D3DXERR_INVALIDDATA, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); +} + static void test_D3DXCreateCubeTextureFromFileInMemory(IDirect3DDevice9 *device) { HRESULT hr; @@ -1229,6 +1272,7 @@ START_TEST(texture) test_D3DXFillTexture(device); test_D3DXFillCubeTexture(device); test_D3DXFillVolumeTexture(device); + test_D3DXCreateTextureFromFileInMemory(device); test_D3DXCreateCubeTextureFromFileInMemory(device); test_D3DXCreateVolumeTextureFromFileInMemory(device); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 001c5a7..07e3d02 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -504,6 +504,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, BOOL file_width = FALSE, file_height = FALSE; BOOL file_format = FALSE, file_miplevels = FALSE; D3DXIMAGE_INFO imginfo; + UINT loaded_miplevels; D3DCAPS9 caps; HRESULT hr; @@ -571,6 +572,12 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, return hr; } + if (imginfo.MipLevels < miplevels && (D3DFMT_DXT1 <= imginfo.Format && imginfo.Format <= D3DFMT_DXT5)) + { + FIXME("Generation of mipmaps for compressed pixel formats is not implemented yet\n"); + miplevels = imginfo.MipLevels; + } + if (((file_width) && (width != imginfo.Width)) || ((file_height) && (height != imginfo.Height)) || ((file_format) && (format != imginfo.Format)) || @@ -601,9 +608,16 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, } /* Load the file */ - IDirect3DTexture9_GetSurfaceLevel(*texptr, 0, &surface); - hr = D3DXLoadSurfaceFromFileInMemory(surface, palette, NULL, srcdata, srcdatasize, NULL, filter, colorkey, NULL); - IDirect3DSurface9_Release(surface); + if (imginfo.ImageFileFormat != D3DXIFF_DDS) + { + IDirect3DTexture9_GetSurfaceLevel(*texptr, 0, &surface); + hr = D3DXLoadSurfaceFromFileInMemory(surface, palette, NULL, srcdata, srcdatasize, NULL, filter, colorkey, NULL); + IDirect3DSurface9_Release(surface); + } + else + { + hr = load_texture_from_dds(*texptr, srcdata, palette, filter, colorkey, &imginfo); + } if (FAILED(hr)) { @@ -612,7 +626,8 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, return hr; } - hr = D3DXFilterTexture((IDirect3DBaseTexture9*) *texptr, palette, 0, mipfilter); + loaded_miplevels = min(miplevels, imginfo.MipLevels); + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) *texptr, palette, loaded_miplevels - 1, mipfilter); if (FAILED(hr)) {

1 0

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

14 May '12

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/tests: Add tests for compressed pixel formats support in D3DXLoadSurface functions .
by Alexandre Julliard 14 May '12

14 May '12

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