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

Andrew Eikum : dsound: Ensure primary buffer' s buffer is large enough to hold the entire prebuffer.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 8327e6f4234bcc073c6d2979286341ff6103b220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8327e6f4234bcc073c6d29792… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 14 12:31:17 2012 -0500 dsound: Ensure primary buffer's buffer is large enough to hold the entire prebuffer. --- dlls/dsound/primary.c | 36 ++++++++++++++---------------------- 1 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 153f1a1..7fed78e 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -58,18 +58,6 @@ static DWORD DSOUND_fraglen(DirectSoundDevice *device) return ret; } -static void DSOUND_RecalcPrimary(DirectSoundDevice *device) -{ - TRACE("(%p)\n", device); - - device->fraglen = DSOUND_fraglen(device); - device->helfrags = device->buflen / device->fraglen; - TRACE("fraglen=%d helfrags=%d\n", device->fraglen, device->helfrags); - - /* calculate the 10ms write lead */ - device->writelead = (device->pwfx->nSamplesPerSec / 100) * device->pwfx->nBlockAlign; -} - HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) { UINT prebuf_frames; @@ -153,18 +141,23 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) { - DWORD buflen; LPBYTE newbuf; TRACE("(%p)\n", device); + device->fraglen = DSOUND_fraglen(device); + /* on original windows, the buffer it set to a fixed size, no matter what the settings are. on windows this size is always fixed (tested on win-xp) */ if (!device->buflen) device->buflen = ds_hel_buflen; - buflen = device->buflen; - buflen -= buflen % device->pwfx->nBlockAlign; - device->buflen = buflen; + device->buflen -= device->buflen % device->pwfx->nBlockAlign; + while(device->buflen < device->fraglen * device->prebuf){ + device->buflen += ds_hel_buflen; + device->buflen -= device->buflen % device->pwfx->nBlockAlign; + } + + device->helfrags = device->buflen / device->fraglen; device->mix_buffer_len = DSOUND_bufpos_to_mixpos(device, device->buflen); device->mix_buffer = HeapAlloc(GetProcessHeap(), 0, device->mix_buffer_len); @@ -174,13 +167,11 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) if (device->state == STATE_PLAYING) device->state = STATE_STARTING; else if (device->state == STATE_STOPPING) device->state = STATE_STOPPED; - TRACE("desired buflen=%d, old buffer=%p\n", buflen, device->buffer); - /* reallocate emulated primary buffer */ if (device->buffer) - newbuf = HeapReAlloc(GetProcessHeap(),0,device->buffer, buflen); + newbuf = HeapReAlloc(GetProcessHeap(),0,device->buffer, device->buflen); else - newbuf = HeapAlloc(GetProcessHeap(),0, buflen); + newbuf = HeapAlloc(GetProcessHeap(),0, device->buflen); if (!newbuf) { ERR("failed to allocate primary buffer\n"); @@ -188,11 +179,12 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) /* but the old buffer might still exist and must be re-prepared */ } - DSOUND_RecalcPrimary(device); + device->writelead = (device->pwfx->nSamplesPerSec / 100) * device->pwfx->nBlockAlign; device->buffer = newbuf; - TRACE("fraglen=%d\n", device->fraglen); + TRACE("buflen: %u, fraglen: %u, helfrags: %u, mix_buffer_len: %u\n", + device->buflen, device->fraglen, device->helfrags, device->mix_buffer_len); device->mixfunction = mixfunctions[device->pwfx->wBitsPerSample/8 - 1]; device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1];

1 0

Andrew Eikum : dsound: Express buffer positions in terms of bytes, not fragments.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 1053bfb48d7a1ebb593b03dcea7bc51ec0867e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1053bfb48d7a1ebb593b03dce… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 14 12:31:10 2012 -0500 dsound: Express buffer positions in terms of bytes, not fragments. --- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 65 ++++++++++++++++++----------------------- dlls/dsound/primary.c | 13 ++------ 3 files changed, 34 insertions(+), 46 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index bed6959..d7cb183 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -83,7 +83,7 @@ struct DirectSoundDevice DSCAPS drvcaps; DWORD priolevel; PWAVEFORMATEX pwfx; - UINT timerID, pwplay, pwqueue, prebuf, helfrags; + UINT timerID, playing_offs_bytes, in_mmdev_bytes, prebuf, helfrags; UINT64 last_pos_bytes; DWORD fraglen; LPBYTE buffer; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 81cbd02..625665f 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -663,53 +663,47 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) { - DWORD prebuf_frames, buf_offs_bytes, wave_fragpos; - int prebuf_frags; + DWORD prebuf_frames, prebuf_bytes, read_offs_bytes; BYTE *buffer; HRESULT hr; TRACE("(%p)\n", device); - /* calculate the current wave frag position */ - wave_fragpos = (device->pwplay + device->pwqueue) % device->helfrags; + read_offs_bytes = (device->playing_offs_bytes + device->in_mmdev_bytes) % device->buflen; - /* calculate the current wave write position */ - buf_offs_bytes = wave_fragpos * device->fraglen; - - TRACE("wave_fragpos = %i, buf_offs_bytes = %i, pwqueue = %i, prebuf = %i\n", - wave_fragpos, buf_offs_bytes, device->pwqueue, device->prebuf); + TRACE("read_offs_bytes = %u, playing_offs_bytes = %u, in_mmdev_bytes: %u, prebuf = %u\n", + read_offs_bytes, device->playing_offs_bytes, device->in_mmdev_bytes, device->prebuf); if (!force) { - /* check remaining prebuffered frags */ - prebuf_frags = device->mixpos / device->fraglen; - if (prebuf_frags == device->helfrags) - --prebuf_frags; - TRACE("wave_fragpos = %d, mixpos_frags = %d\n", wave_fragpos, prebuf_frags); - if (prebuf_frags < wave_fragpos) - prebuf_frags += device->helfrags; - prebuf_frags -= wave_fragpos; - TRACE("wanted prebuf_frags = %d\n", prebuf_frags); + if(device->mixpos < device->playing_offs_bytes) + prebuf_bytes = device->mixpos + device->buflen - device->playing_offs_bytes; + else + prebuf_bytes = device->mixpos - device->playing_offs_bytes; } else /* buffer the maximum amount of frags */ - prebuf_frags = device->prebuf; + prebuf_bytes = device->prebuf * device->fraglen; /* limit to the queue we have left */ - if ((prebuf_frags + device->pwqueue) > device->prebuf) - prebuf_frags = device->prebuf - device->pwqueue; + if(device->in_mmdev_bytes + prebuf_bytes > device->prebuf * device->fraglen) + prebuf_bytes = device->prebuf * device->fraglen - device->in_mmdev_bytes; - TRACE("prebuf_frags = %i\n", prebuf_frags); + TRACE("prebuf_bytes = %u\n", prebuf_bytes); - if(!prebuf_frags) + if(!prebuf_bytes) return; - /* adjust queue */ - device->pwqueue += prebuf_frags; + device->in_mmdev_bytes += prebuf_bytes; - prebuf_frames = ((prebuf_frags + wave_fragpos > device->helfrags) ? - (device->helfrags - wave_fragpos) : - (prebuf_frags)) * device->fraglen / device->pwfx->nBlockAlign; + if(prebuf_bytes + read_offs_bytes > device->buflen){ + DWORD chunk_bytes = device->buflen - read_offs_bytes; + prebuf_frames = chunk_bytes / device->pwfx->nBlockAlign; + prebuf_bytes -= chunk_bytes; + }else{ + prebuf_frames = prebuf_bytes / device->pwfx->nBlockAlign; + prebuf_bytes = 0; + } hr = IAudioRenderClient_GetBuffer(device->render, prebuf_frames, &buffer); if(FAILED(hr)){ @@ -717,7 +711,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) return; } - memcpy(buffer, device->buffer + buf_offs_bytes, + memcpy(buffer, device->buffer + read_offs_bytes, prebuf_frames * device->pwfx->nBlockAlign); hr = IAudioRenderClient_ReleaseBuffer(device->render, prebuf_frames, 0); @@ -727,9 +721,8 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) } /* check if anything wrapped */ - prebuf_frags = prebuf_frags + wave_fragpos - device->helfrags; - if(prebuf_frags > 0){ - prebuf_frames = prebuf_frags * device->fraglen / device->pwfx->nBlockAlign; + if(prebuf_bytes > 0){ + prebuf_frames = prebuf_bytes / device->pwfx->nBlockAlign; hr = IAudioRenderClient_GetBuffer(device->render, prebuf_frames, &buffer); if(FAILED(hr)){ @@ -746,7 +739,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) } } - TRACE("queue now = %i\n", device->pwqueue); + TRACE("in_mmdev_bytes now = %i\n", device->in_mmdev_bytes); } /** @@ -783,9 +776,9 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) delta_frags = (pos_bytes - device->last_pos_bytes) / device->fraglen; if(delta_frags > 0){ - device->pwplay += delta_frags; - device->pwplay %= device->helfrags; - device->pwqueue -= delta_frags; + device->playing_offs_bytes += delta_frags * device->fraglen; + device->playing_offs_bytes %= device->buflen; + device->in_mmdev_bytes -= delta_frags * device->fraglen; device->last_pos_bytes = pos_bytes - (pos_bytes % device->fraglen); } diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index b5a09f8..aec053b 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -210,7 +210,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1]; FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); FillMemory(device->mix_buffer, device->mix_buffer_len, 0); - device->last_pos_bytes = device->pwplay = device->pwqueue = device->playpos = device->mixpos = 0; + device->last_pos_bytes = device->playing_offs_bytes = device->in_mmdev_bytes = device->playpos = device->mixpos = 0; return DS_OK; } @@ -221,8 +221,6 @@ static void DSOUND_PrimaryClose(DirectSoundDevice *device) TRACE("(%p)\n", device); - device->pwqueue = (DWORD)-1; /* resetting queues */ - if(device->client){ hr = IAudioClient_Stop(device->client); if(FAILED(hr)) @@ -230,7 +228,7 @@ static void DSOUND_PrimaryClose(DirectSoundDevice *device) } /* clear the queue */ - device->pwqueue = 0; + device->in_mmdev_bytes = 0; } HRESULT DSOUND_PrimaryCreate(DirectSoundDevice *device) @@ -308,17 +306,14 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP { TRACE("(%p,%p,%p)\n", device, playpos, writepos); - TRACE("pwplay=%i, pwqueue=%i\n", device->pwplay, device->pwqueue); - /* check if playpos was requested */ if (playpos) - /* use the cached play position */ - *playpos = device->pwplay * device->fraglen; + *playpos = device->playing_offs_bytes; /* check if writepos was requested */ if (writepos) /* the writepos is the first non-queued position */ - *writepos = ((device->pwplay + device->pwqueue) % device->helfrags) * device->fraglen; + *writepos = (device->playing_offs_bytes + device->in_mmdev_bytes) % device->buflen; TRACE("playpos = %d, writepos = %d (%p, time=%d)\n", playpos?*playpos:-1, writepos?*writepos:-1, device, GetTickCount()); return DS_OK;

1 0

Andrew Eikum : dsound: Base fragment size off of the MMDevice's period.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 7dce1418ffabe9c63fe40178fe455e23671bb998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dce1418ffabe9c63fe40178f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 14 12:31:13 2012 -0500 dsound: Base fragment size off of the MMDevice's period. --- dlls/dsound/dsound_private.h | 1 - dlls/dsound/primary.c | 46 +++++++++++++++-------------------------- 2 files changed, 17 insertions(+), 30 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index d7cb183..44d4d2f 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -276,7 +276,6 @@ HRESULT DSOUND_Create8(REFIID riid, LPDIRECTSOUND8 *ppDS) DECLSPEC_HIDDEN; /* primary.c */ -DWORD DSOUND_fraglen(DWORD nSamplesPerSec, DWORD nBlockAlign) DECLSPEC_HIDDEN; HRESULT DSOUND_PrimaryCreate(DirectSoundDevice *device) DECLSPEC_HIDDEN; HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) DECLSPEC_HIDDEN; HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index aec053b..153f1a1 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -40,41 +40,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); -/** Calculate how long a fragment length of about 10 ms should be in frames - * - * nSamplesPerSec: Frequency rate in samples per second - * nBlockAlign: Size of a single blockalign - * - * Returns: - * Size in bytes of a single fragment - */ -DWORD DSOUND_fraglen(DWORD nSamplesPerSec, DWORD nBlockAlign) +static DWORD DSOUND_fraglen(DirectSoundDevice *device) { - /* Given a timer delay of 10ms, the fragment size is approximately: - * fraglen = (nSamplesPerSec * 10 / 1000) * nBlockAlign - * ==> fraglen = (nSamplesPerSec / 100) * nBlockSize - * - * ALSA uses buffers that are powers of 2. Because of this, fraglen - * is rounded up to the nearest power of 2: - */ - - if (nSamplesPerSec <= 12800) - return 128 * nBlockAlign; - - if (nSamplesPerSec <= 25600) - return 256 * nBlockAlign; - - if (nSamplesPerSec <= 51200) - return 512 * nBlockAlign; + REFERENCE_TIME period; + HRESULT hr; + DWORD ret; - return 1024 * nBlockAlign; + hr = IAudioClient_GetDevicePeriod(device->client, &period, NULL); + if(FAILED(hr)){ + /* just guess at 10ms */ + WARN("GetDevicePeriod failed: %08x\n", hr); + ret = MulDiv(device->pwfx->nBlockAlign, device->pwfx->nSamplesPerSec, 100); + }else + ret = MulDiv(device->pwfx->nSamplesPerSec * device->pwfx->nBlockAlign, period, 10000000); + + ret -= ret % device->pwfx->nBlockAlign; + return ret; } static void DSOUND_RecalcPrimary(DirectSoundDevice *device) { TRACE("(%p)\n", device); - device->fraglen = DSOUND_fraglen(device->pwfx->nSamplesPerSec, device->pwfx->nBlockAlign); + device->fraglen = DSOUND_fraglen(device); device->helfrags = device->buflen / device->fraglen; TRACE("fraglen=%d helfrags=%d\n", device->fraglen, device->helfrags); @@ -114,7 +102,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return hres; } - prebuf_frames = device->prebuf * DSOUND_fraglen(device->pwfx->nSamplesPerSec, device->pwfx->nBlockAlign) / device->pwfx->nBlockAlign; + prebuf_frames = device->prebuf * DSOUND_fraglen(device) / device->pwfx->nBlockAlign; prebuf_rt = (10000000 * (UINT64)prebuf_frames) / device->pwfx->nSamplesPerSec; hres = IAudioClient_Initialize(device->client,

1 0

Józef Kucia : d3dx9: Forward D3DXCreateCubeTextureFromFile functions to D3DXCreateCubeTextureFromFileInMemoryEx .
by Alexandre Julliard May 14, 2012

May 14, 2012

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: Add DDS support in D3DXCreateTextureFromFile functions.
by Alexandre Julliard May 14, 2012

May 14, 2012

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

Andrew Eikum : dsound: Remove minlen, since we always mix full chunks anyway.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 2c6087457b97e815ee094e7ed75ca79317a5d14a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6087457b97e815ee094e7ed… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 14 12:31:01 2012 -0500 dsound: Remove minlen, since we always mix full chunks anyway. --- dlls/dsound/mixer.c | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index ec5a264..81cbd02 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -609,10 +609,9 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mi * Returns: the length beyond the writepos that was mixed to. */ -static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, DWORD mixlen, BOOL recover, BOOL *all_stopped) +static void DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, DWORD mixlen, BOOL recover, BOOL *all_stopped) { - INT i, len; - DWORD minlen = 0; + INT i; IDirectSoundBufferImpl *dsb; /* unless we find a running buffer, all have stopped */ @@ -643,22 +642,13 @@ static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos dsb->state = STATE_PLAYING; /* mix next buffer into the main buffer */ - len = DSOUND_MixOne(dsb, writepos, mixlen); - - if (!minlen) minlen = len; - - /* record the minimum length mixed from all buffers */ - /* we only want to return the length which *all* buffers have mixed */ - else if (len) minlen = (len < minlen) ? len : minlen; + DSOUND_MixOne(dsb, writepos, mixlen); *all_stopped = FALSE; } RtlReleaseResource(&dsb->lock); } } - - TRACE("Mixed at least %d from all buffers\n", minlen); - return minlen; } /** @@ -801,7 +791,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (device->priolevel != DSSCL_WRITEPRIMARY) { BOOL recover = FALSE, all_stopped = FALSE; - DWORD playpos, writepos, writelead, maxq, frag, prebuff_max, prebuff_left, size1, size2, mixplaypos, mixplaypos2; + DWORD playpos, writepos, writelead, maxq, prebuff_max, prebuff_left, size1, size2, mixplaypos, mixplaypos2; LPVOID buf1, buf2; int nfiller; @@ -873,19 +863,19 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) prebuff_left, device->prebuf, device->fraglen, prebuff_max, writelead); /* do the mixing */ - frag = DSOUND_MixToPrimary(device, writepos, maxq, recover, &all_stopped); + DSOUND_MixToPrimary(device, writepos, maxq, recover, &all_stopped); - if (frag + writepos > device->buflen) + if (maxq + writepos > device->buflen) { DWORD todo = device->buflen - writepos; device->normfunction(device->mix_buffer + DSOUND_bufpos_to_mixpos(device, writepos), device->buffer + writepos, todo); - device->normfunction(device->mix_buffer, device->buffer, frag - todo); + device->normfunction(device->mix_buffer, device->buffer, maxq - todo); } else - device->normfunction(device->mix_buffer + DSOUND_bufpos_to_mixpos(device, writepos), device->buffer + writepos, frag); + device->normfunction(device->mix_buffer + DSOUND_bufpos_to_mixpos(device, writepos), device->buffer + writepos, maxq); /* update the mix position, taking wrap-around into account */ - device->mixpos = writepos + frag; + device->mixpos = writepos + maxq; device->mixpos %= device->buflen; /* update prebuff left */

1 0

Alexandre Julliard : ole32: Add a NULL pointer check in CoDisconnectObject.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 2736d28064437a470897bb9cb8688e354bb93908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2736d28064437a470897bb9cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 14 18:24:19 2012 +0200 ole32: Add a NULL pointer check in CoDisconnectObject. --- dlls/ole32/compobj.c | 2 ++ dlls/ole32/tests/marshal.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 72ba32a..ff8f961 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1557,6 +1557,8 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) TRACE("(%p, 0x%08x)\n", lpUnk, reserved); + if (!lpUnk) return E_INVALIDARG; + hr = IUnknown_QueryInterface(lpUnk, &IID_IMarshal, (void **)&marshal); if (hr == S_OK) { diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index c178912..91de43b 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1331,6 +1331,9 @@ static void test_disconnect_stub(void) CoDisconnectObject((IUnknown*)&Test_ClassFactory, 0); ok_no_locks(); + + hr = CoDisconnectObject(NULL, 0); + ok( hr == E_INVALIDARG, "wrong status %x\n", hr ); } /* tests failure case of a same-thread marshal and unmarshal twice */

1 0

Józef Kucia : d3dx9: Properly check if a texture is lockable in D3DXCreateTextureFromFileInMemoryEx .
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 3728a882311fce55d3a3ca5b79b7251cbb0a9e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3728a882311fce55d3a3ca5b7… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun May 13 23:00:11 2012 +0200 d3dx9: Properly check if a texture is lockable in D3DXCreateTextureFromFileInMemoryEx. --- dlls/d3dx9_36/tests/texture.c | 17 +++++++++++++++++ dlls/d3dx9_36/texture.c | 10 +++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 60017ec..1314fa2 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1149,6 +1149,22 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) ok(hr == D3DXERR_INVALIDDATA, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); } +static void test_D3DXCreateTextureFromFileInMemoryEx(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3DTexture9 *texture; + + hr = D3DXCreateTextureFromFileInMemoryEx(device, dds_16bit, sizeof(dds_16bit), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, + 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + + hr = D3DXCreateTextureFromFileInMemoryEx(device, dds_16bit, sizeof(dds_16bit), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, + D3DUSAGE_DYNAMIC, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); +} + static void test_D3DXCreateCubeTextureFromFileInMemory(IDirect3DDevice9 *device) { HRESULT hr; @@ -1273,6 +1289,7 @@ START_TEST(texture) test_D3DXFillCubeTexture(device); test_D3DXFillVolumeTexture(device); test_D3DXCreateTextureFromFileInMemory(device); + test_D3DXCreateTextureFromFileInMemoryEx(device); test_D3DXCreateCubeTextureFromFileInMemory(device); test_D3DXCreateVolumeTextureFromFileInMemory(device); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 07e3d02..6a33547 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -590,15 +590,15 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, return D3DERR_INVALIDCALL; /* Create the to-be-filled texture */ - if ((caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (pool != D3DPOOL_DEFAULT) && (usage != D3DUSAGE_DYNAMIC)) + if (pool == D3DPOOL_DEFAULT && !((caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && usage == D3DUSAGE_DYNAMIC)) { - hr = D3DXCreateTexture(device, width, height, miplevels, usage, format, pool, texture); - texptr = texture; + hr = D3DXCreateTexture(device, width, height, miplevels, usage, format, D3DPOOL_SYSTEMMEM, &buftex); + texptr = &buftex; } else { - hr = D3DXCreateTexture(device, width, height, miplevels, usage, format, D3DPOOL_SYSTEMMEM, &buftex); - texptr = &buftex; + hr = D3DXCreateTexture(device, width, height, miplevels, usage, format, pool, texture); + texptr = texture; } if (FAILED(hr))

1 0

Józef Kucia : d3dx9: Add missing pixel formats.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 42dd957c508fb33c6bd796696b547c4b1dd4c5b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42dd957c508fb33c6bd796696… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun May 13 23:00:03 2012 +0200 d3dx9: Add missing pixel formats. --- dlls/d3dx9_36/surface.c | 23 ++++++++++++++++++++--- dlls/d3dx9_36/tests/surface.c | 4 ++++ dlls/d3dx9_36/util.c | 1 + 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 43b58e3..7556ead 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -104,6 +104,7 @@ static const GUID *d3dformat_to_wic_guid(D3DFORMAT format) #define DDS_PF_RGB 0x40 #define DDS_PF_YUV 0x200 #define DDS_PF_LUMINANCE 0x20000 +#define DDS_PF_BUMPDUDV 0x80000 struct dds_pixel_format { @@ -217,6 +218,8 @@ static D3DFORMAT dds_luminance_to_d3dformat(const struct dds_pixel_format *pixel } if (pixel_format->bpp == 16) { + if (pixel_format->rmask == 0xffff) + return D3DFMT_L16; if ((pixel_format->flags & DDS_PF_ALPHA) && pixel_format->rmask == 0x00ff && pixel_format->amask == 0xff00) return D3DFMT_A8L8; } @@ -235,6 +238,18 @@ static D3DFORMAT dds_alpha_to_d3dformat(const struct dds_pixel_format *pixel_for return D3DFMT_UNKNOWN; } +static D3DFORMAT dds_bump_to_d3dformat(const struct dds_pixel_format *pixel_format) +{ + if (pixel_format->bpp == 16 && pixel_format->rmask == 0x00ff && pixel_format->gmask == 0xff00) + return D3DFMT_V8U8; + if (pixel_format->bpp == 32 && pixel_format->rmask == 0x0000ffff && pixel_format->gmask == 0xffff0000) + return D3DFMT_V16U16; + + WARN("Unknown bump pixel format (%#x, %#x, %#x, %#x, %#x)\n", pixel_format->bpp, + pixel_format->rmask, pixel_format->gmask, pixel_format->bmask, pixel_format->amask); + return D3DFMT_UNKNOWN; +} + static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pixel_format) { if (pixel_format->flags & DDS_PF_FOURCC) @@ -245,10 +260,12 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi return dds_luminance_to_d3dformat(pixel_format); if (pixel_format->flags & DDS_PF_ALPHA_ONLY) return dds_alpha_to_d3dformat(pixel_format); + if (pixel_format->flags & DDS_PF_BUMPDUDV) + return dds_bump_to_d3dformat(pixel_format); - WARN("Unknown pixel format (fourcc %#x, bpp %#x, r %#x, g %#x, b %#x, a %#x)\n", - pixel_format->fourcc, pixel_format->bpp, pixel_format->rmask, pixel_format->gmask, - pixel_format->bmask, pixel_format->amask); + WARN("Unknown pixel format (flags %#x, fourcc %#x, bpp %#x, r %#x, g %#x, b %#x, a %#x)\n", + pixel_format->flags, pixel_format->fourcc, pixel_format->bpp, + pixel_format->rmask, pixel_format->gmask, pixel_format->bmask, pixel_format->amask); return D3DFMT_UNKNOWN; } diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 40308e8..3d8ad24 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -150,6 +150,7 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons #define DDS_PF_FOURCC 0x00000004 #define DDS_PF_RGB 0x00000040 #define DDS_PF_LUMINANCE 0x00020000 +#define DDS_PF_BUMPDUDV 0x00080000 static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask, @@ -397,8 +398,11 @@ static void test_D3DXGetImageInfo(void) check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0, D3DFMT_X8R8G8B8); check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_G16R16); check_dds_pixel_format(DDS_PF_LUMINANCE, 0, 8, 0xff, 0, 0, 0, D3DFMT_L8); + check_dds_pixel_format(DDS_PF_LUMINANCE, 0, 16, 0xffff, 0, 0, 0, D3DFMT_L16); check_dds_pixel_format(DDS_PF_LUMINANCE | DDS_PF_ALPHA, 0, 16, 0x00ff, 0, 0, 0xff00, D3DFMT_A8L8); check_dds_pixel_format(DDS_PF_LUMINANCE | DDS_PF_ALPHA, 0, 8, 0x0f, 0, 0, 0xf0, D3DFMT_A4L4); + check_dds_pixel_format(DDS_PF_BUMPDUDV, 0, 16, 0x00ff, 0xff00, 0, 0, D3DFMT_V8U8); + check_dds_pixel_format(DDS_PF_BUMPDUDV, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_V16U16); todo_wine { hr = D3DXGetImageInfoFromFileInMemory(dds_16bit, sizeof(dds_16bit) - 1, &info); diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 4dbf44c..ad8a6ea 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -62,6 +62,7 @@ static const PixelFormatDesc formats[] = {D3DFMT_G16R16, {0, 16, 16, 0}, { 0, 0, 16, 0}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A8, {8, 0, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A8L8, {8, 8, 0, 0}, { 8, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba}, + {D3DFMT_A4L4, {4, 4, 0, 0}, { 4, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, {D3DFMT_DXT1, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 8, FORMAT_ARGB, NULL, NULL }, {D3DFMT_DXT2, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, {D3DFMT_DXT3, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL },

1 0

Jacek Caban : mshtml: Always use English locale in document_write to perform type conversion.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 888505d458cf77e449039108e578ea48cf5bc5b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=888505d458cf77e449039108e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 14 11:33:10 2012 +0200 mshtml: Always use English locale in document_write to perform type conversion. --- dlls/mshtml/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 71f0db9..6b616da 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -831,7 +831,7 @@ static HRESULT document_write(HTMLDocument *This, SAFEARRAY *psarray, BOOL ln) if(V_VT(var+i) == VT_BSTR) { nsAString_InitDepend(&nsstr, V_BSTR(var+i)); }else { - hres = VariantChangeType(&tmp, var+i, 0, VT_BSTR); + hres = VariantChangeTypeEx(&tmp, var+i, MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT), 0, VT_BSTR); if(FAILED(hres)) { WARN("Could not convert %s to string\n", debugstr_variant(var+i)); break;

1 0