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

Henri Verbeet : wined3d: Figure out the index data pointer inside drawPrimitive().
by Alexandre Julliard May 2, 2012

May 2, 2012

Module: wine Branch: master Commit: a8a201cf61b39f79be980c4f193905bf8c0276c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a201cf61b39f79be980c4f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 1 20:25:28 2012 +0200 wined3d: Figure out the index data pointer inside drawPrimitive(). We want to do this after context_apply_draw_state(), when resource locations are all setup. --- dlls/wined3d/device.c | 9 ++------- dlls/wined3d/drawprim.c | 24 +++++++++++++++++------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 030add2..0b0b600 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4008,14 +4008,11 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) { - struct wined3d_buffer *index_buffer; - GLuint vbo; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - index_buffer = device->stateBlock->state.index_buffer; - if (!index_buffer) + if (!device->stateBlock->state.index_buffer) { /* D3D9 returns D3DERR_INVALIDCALL when DrawIndexedPrimitive is called * without an index buffer set. (The first time at least...) @@ -4036,7 +4033,6 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic device_invalidate_state(device, STATE_INDEXBUFFER); device->stateBlock->state.user_stream = FALSE; } - vbo = index_buffer->buffer_object; if (!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && device->stateBlock->state.load_base_vertex_index != device->stateBlock->state.base_vertex_index) @@ -4045,8 +4041,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic device_invalidate_state(device, STATE_BASEVERTEXINDEX); } - drawPrimitive(device, index_count, start_idx, TRUE, - vbo ? NULL : index_buffer->resource.allocatedMemory); + drawPrimitive(device, index_count, start_idx, TRUE, NULL); return WINED3D_OK; } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 136c8f5..18b8f3f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -669,14 +669,24 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId BOOL emulation = FALSE; const struct wined3d_stream_info *stream_info = &device->strided_streams; struct wined3d_stream_info stridedlcl; - UINT idx_size; + UINT idx_size = 0; - if (!indexed) - idx_size = 0; - else if (state->index_format == WINED3DFMT_R16_UINT) - idx_size = 2; - else - idx_size = 4; + if (indexed) + { + if (!state->user_stream) + { + struct wined3d_buffer *index_buffer = state->index_buffer; + if (!index_buffer->buffer_object) + idxData = index_buffer->resource.allocatedMemory; + else + idxData = NULL; + } + + if (state->index_format == WINED3DFMT_R16_UINT) + idx_size = 2; + else + idx_size = 4; + } if (!use_vs(state)) {

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in d3d9_texture_cube_UnlockRect().
by Alexandre Julliard May 2, 2012

May 2, 2012

Module: wine Branch: master Commit: f9fe89b3860a5857154140fb223a025dda079a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9fe89b3860a5857154140fb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 1 20:25:25 2012 +0200 d3d9: Properly retrieve an interface pointer in d3d9_texture_cube_UnlockRect(). --- dlls/d3d9/texture.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index d74cc67..c9114ef 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -793,6 +793,7 @@ static HRESULT WINAPI d3d9_texture_cube_UnlockRect(IDirect3DCubeTexture9 *iface, { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); struct wined3d_resource *sub_resource; + IDirect3DSurface9Impl *surface_impl; UINT sub_resource_idx; HRESULT hr; @@ -803,7 +804,10 @@ static HRESULT WINAPI d3d9_texture_cube_UnlockRect(IDirect3DCubeTexture9 *iface, if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DSurface9_UnlockRect((IDirect3DSurface9 *)wined3d_resource_get_parent(sub_resource)); + { + surface_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DSurface9_UnlockRect(&surface_impl->IDirect3DSurface9_iface); + } wined3d_mutex_unlock(); return hr;

1 0

André Hentschel : winedbg: Complete the Thumb disassembler.
by Alexandre Julliard May 2, 2012

May 2, 2012

Module: wine Branch: master Commit: f86ea4cbe9fb81c3c8edc583214f8149d6df2fcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86ea4cbe9fb81c3c8edc5832… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 1 19:45:45 2012 +0200 winedbg: Complete the Thumb disassembler. --- programs/winedbg/be_arm.c | 77 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 71 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 7da28b6..8ceb14c 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -67,7 +67,7 @@ static char const tbl_shifts[][4] = { }; static char const tbl_hiops_t[][4] = { -"add", "cmp", "mov", "bx" + "add", "cmp", "mov", "bx" }; static char const tbl_aluops_t[][4] = { @@ -76,7 +76,11 @@ static char const tbl_aluops_t[][4] = { }; static char const tbl_immops_t[][4] = { -"mov", "cmp", "add", "sub" + "mov", "cmp", "add", "sub" +}; + +static char const tbl_sregops_t[][5] = { + "strh", "ldsb", "ldrh", "ldsh" }; static UINT db_get_inst(void* addr, int size) @@ -368,7 +372,7 @@ static WORD thumb_disasm_aluop(WORD inst, ADDRESS64 *addr) return 0; } -static WORD thumb_disasm_blocktrans(WORD inst, ADDRESS64 *addr) +static WORD thumb_disasm_pushpop(WORD inst, ADDRESS64 *addr) { short lrpc = (inst >> 8) & 0x01; short load = (inst >> 11) & 0x01; @@ -388,7 +392,30 @@ static WORD thumb_disasm_blocktrans(WORD inst, ADDRESS64 *addr) else dbg_printf("%s, ", tbl_regs[i]); } if (lrpc) - dbg_printf(", %s", load ? "pc" : "lr"); + dbg_printf("%s%s", last ? ", " : "", load ? "pc" : "lr"); + + dbg_printf("}"); + return 0; +} + +static WORD thumb_disasm_blocktrans(WORD inst, ADDRESS64 *addr) +{ + short load = (inst >> 11) & 0x01; + short i; + short last; + + for (i=7;i>=0;i--) + if ((inst>>i) & 1) break; + last = i; + + dbg_printf("\n\t%s\t%s!, {", load ? "ldmia" : "stmia", tbl_regs[(inst >> 8) & 0x07]); + + for (i=0;i<=7;i++) + if ((inst>>i) & 1) + { + if (i == last) dbg_printf("%s", tbl_regs[i]); + else dbg_printf("%s, ", tbl_regs[i]); + } dbg_printf("}"); return 0; @@ -417,6 +444,18 @@ static WORD thumb_disasm_condbranch(WORD inst, ADDRESS64 *addr) return 0; } +static WORD thumb_disasm_uncondbranch(WORD inst, ADDRESS64 *addr) +{ + short offset = (inst & 0x07ff) << 1; + + if (offset & 0x0800) offset |= 0xf000; + offset += 4; + + dbg_printf("\n\tb\t"); + db_printsym(addr->Offset + offset); + return 0; +} + static WORD thumb_disasm_loadadr(WORD inst, ADDRESS64 *addr) { WORD src = (inst >> 11) & 0x01; @@ -471,6 +510,28 @@ static WORD thumb_disasm_ldrimm(WORD inst, ADDRESS64 *addr) return 0; } +static WORD thumb_disasm_ldrhimm(WORD inst, ADDRESS64 *addr) +{ + WORD offset = (inst & 0x07c0) >> 5; + dbg_printf("\n\t%s\t%s, [%s, #%u]", (inst & 0x0800)?"ldrh":"strh", + tbl_regs[inst & 0x07], tbl_regs[(inst >> 3) & 0x07], offset); + return 0; +} + +static WORD thumb_disasm_ldrreg(WORD inst, ADDRESS64 *addr) +{ + dbg_printf("\n\t%s%s\t%s, [%s, %s]", (inst & 0x0800)?"ldr":"str", (inst & 0x0400)?"b":"", + tbl_regs[inst & 0x07], tbl_regs[(inst >> 3) & 0x07], tbl_regs[(inst >> 6) & 0x07]); + return 0; +} + +static WORD thumb_disasm_ldrsreg(WORD inst, ADDRESS64 *addr) +{ + dbg_printf("\n\t%s\t%s, [%s, %s]", tbl_sregops_t[(inst >> 10) & 0x03], + tbl_regs[inst & 0x07], tbl_regs[(inst >> 3) & 0x07], tbl_regs[(inst >> 6) & 0x07]); + return 0; +} + static WORD thumb_disasm_immop(WORD inst, ADDRESS64 *addr) { WORD op = (inst >> 11) & 0x03; @@ -531,16 +592,20 @@ struct inst_thumb16 static const struct inst_thumb16 tbl_thumb16[] = { { 0xfc00, 0x4400, thumb_disasm_hireg }, { 0xfc00, 0x4000, thumb_disasm_aluop }, - { 0xf600, 0xb400, thumb_disasm_blocktrans }, + { 0xf600, 0xb400, thumb_disasm_pushpop }, + { 0xf000, 0xc000, thumb_disasm_blocktrans }, { 0xf800, 0xf000, thumb_disasm_longbl }, { 0xf000, 0xd000, thumb_disasm_condbranch }, + { 0xf800, 0xe000, thumb_disasm_uncondbranch }, { 0xf000, 0xa000, thumb_disasm_loadadr }, { 0xf800, 0x4800, thumb_disasm_ldrpcrel }, { 0xf000, 0x9000, thumb_disasm_ldrsprel }, { 0xff00, 0xb000, thumb_disasm_addsprel }, { 0xe000, 0x6000, thumb_disasm_ldrimm }, + { 0xf000, 0x8000, thumb_disasm_ldrhimm }, + { 0xf200, 0x5000, thumb_disasm_ldrreg }, + { 0xf200, 0x5200, thumb_disasm_ldrsreg }, { 0xe000, 0x2000, thumb_disasm_immop }, - { 0xf000, 0xd000, thumb_disasm_condbranch }, { 0xff00, 0xdf00, thumb_disasm_swi }, { 0xff00, 0xbf00, thumb_disasm_nop }, { 0xf800, 0x1800, thumb_disasm_addsub },

1 0

Alexander E. Patrakov : dsound: Clean up channels.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: 93a0ca7c6c4e111e90d3735f232f796202e77ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a0ca7c6c4e111e90d3735f2… Author: Alexander E. Patrakov <patrakov(a)gmail.com> Date: Mon Dec 12 14:07:49 2011 -0600 dsound: Clean up channels. --- dlls/dsound/dsound_convert.c | 18 ++++++++++ dlls/dsound/dsound_private.h | 8 +++- dlls/dsound/mixer.c | 77 +++++++++++++++++++----------------------- 3 files changed, 59 insertions(+), 44 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index b670c04..63f1eb0 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -104,6 +104,18 @@ static float getieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD chann const bitsgetfunc getbpp[5] = {get8, get16, get24, get32, getieee32}; +float get_mono(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) +{ + DWORD channels = dsb->pwfx->nChannels; + DWORD c; + float val = 0; + /* XXX: does Windows include LFE into the mix? */ + for (c = 0; c < channels; c++) + val += dsb->get_aux(dsb, pos, c); + val /= channels; + return val; +} + static void put8(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) { BYTE* buf = dsb->device->tmp_buffer; @@ -158,6 +170,12 @@ static void put32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, f const bitsputfunc putbpp[4] = {put8, put16, put24, put32}; +void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + dsb->put_aux(dsb, pos, 0, value); + dsb->put_aux(dsb, pos, 1, value); +} + static void mix8(signed char *src, INT *dst, unsigned len) { TRACE("%p - %p %d\n", src, dst, len); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 9f30bff..5d1d62a 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -193,12 +193,16 @@ struct IDirectSoundBufferImpl LONG ds3db_lVolume; BOOL ds3db_need_recalc; /* Used for bit depth conversion */ - bitsgetfunc get; - bitsputfunc put; + int mix_channels; + bitsgetfunc get, get_aux; + bitsputfunc put, put_aux; struct list entry; }; +float get_mono(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) DECLSPEC_HIDDEN; +void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; + HRESULT IDirectSoundBufferImpl_Create( DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 4f73831..5fa15b2 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -178,6 +178,8 @@ static void DSOUND_RecalcFreqAcc(IDirectSoundBufferImpl *dsb) */ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) { + DWORD ichannels = dsb->pwfx->nChannels; + DWORD ochannels = dsb->device->pwfx->nChannels; BOOL needremix = TRUE, needresample = (dsb->freq != dsb->device->pwfx->nSamplesPerSec); DWORD bAlign = dsb->pwfx->nBlockAlign, pAlign = dsb->device->pwfx->nBlockAlign; WAVEFORMATEXTENSIBLE *pwfxe; @@ -200,8 +202,36 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) dsb->freqAcc = dsb->freqAccNext = 0; dsb->freqneeded = needresample; - dsb->get = ieee ? getbpp[4] : getbpp[dsb->pwfx->wBitsPerSample/8 - 1]; - dsb->put = putbpp[dsb->device->pwfx->wBitsPerSample/8 - 1]; + dsb->get_aux = ieee ? getbpp[4] : getbpp[dsb->pwfx->wBitsPerSample/8 - 1]; + dsb->put_aux = putbpp[dsb->device->pwfx->wBitsPerSample/8 - 1]; + + dsb->get = dsb->get_aux; + dsb->put = dsb->put_aux; + + if (ichannels == ochannels) + { + dsb->mix_channels = ichannels; + if (ichannels > 32) { + FIXME("Copying %u channels is unsupported, limiting to first 32\n", ichannels); + dsb->mix_channels = 32; + } + } + else if (ichannels == 1) + { + dsb->mix_channels = 1; + dsb->put = put_mono2stereo; + } + else if (ochannels == 1) + { + dsb->mix_channels = 1; + dsb->get = get_mono; + } + else + { + if (ichannels > 2) + FIXME("Conversion from %u to %u channels is not implemented, falling back to stereo\n", ichannels, ochannels); + dsb->mix_channels = 2; + } if (needremix) { @@ -278,38 +308,13 @@ static inline void cp_fields(const IDirectSoundBufferImpl *dsb, DWORD ipos = dsb->sec_mixpos; UINT istride = dsb->pwfx->nBlockAlign; UINT adj = dsb->freqAdjust; - DirectSoundDevice *device = dsb->device; - float value; ULONG adv; DWORD opos = 0; while (count-- > 0) { - if (device->pwfx->nChannels == dsb->pwfx->nChannels || - (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 6) || - (device->pwfx->nChannels == 8 && dsb->pwfx->nChannels == 2) || - (device->pwfx->nChannels == 6 && dsb->pwfx->nChannels == 2)) { - value = dsb->get(dsb, ipos, 0); - dsb->put(dsb, opos, 0, value); - if (device->pwfx->nChannels == 2 || dsb->pwfx->nChannels == 2) { - value = dsb->get(dsb, ipos, 1); - dsb->put(dsb, opos, 1, value); - } - } - - if (device->pwfx->nChannels == 1 && dsb->pwfx->nChannels == 2) - { - float val = (dsb->get(dsb, ipos, 0) + dsb->get(dsb, ipos, 1)) / 2.; - - dsb->put(dsb, opos, 0, val); - } - - if (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 1) - { - value = dsb->get(dsb, ipos, 0); - dsb->put(dsb, opos, 0, value); - dsb->put(dsb, opos, 1, value); - } - + DWORD channel; + for (channel = 0; channel < dsb->mix_channels; channel++) + dsb->put(dsb, opos, channel, dsb->get(dsb, ipos, channel)); freqAcc += adj; adv = (freqAcc >> DSOUND_FREQSHIFT); freqAcc &= (1 << DSOUND_FREQSHIFT) - 1; @@ -361,18 +366,6 @@ static void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD tmp_l dsb->device->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, tmp_len); } - /* Check for same sample rate */ - if (dsb->freq == dsb->device->pwfx->nSamplesPerSec) { - TRACE("(%p) Same sample rate %d = primary %d\n", dsb, - dsb->freq, dsb->device->pwfx->nSamplesPerSec); - - cp_fields(dsb, oAdvance, size, 0); - return; - } - - /* Mix in different sample rates */ - TRACE("(%p) Adjusting frequency: %d -> %d\n", dsb, dsb->freq, dsb->device->pwfx->nSamplesPerSec); - DSOUND_secpos_to_bufpos(dsb, dsb->sec_mixpos, dsb->sec_mixpos, &freqAcc); /* FIXME: Small problem here when we're overwriting buf_mixpos, it then STILL uses old freqAcc, not sure if it matters or not */

1 0

Jacek Caban : jscript: Added support for VT_I2 in disp_propget.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: b6a1912392ac0a1544ae3ba7d264c320b18a2d02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a1912392ac0a1544ae3ba7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 1 15:04:37 2012 +0200 jscript: Added support for VT_I2 in disp_propget. --- dlls/jscript/dispex.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f214ea0..3b52145 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -958,6 +958,15 @@ jsdisp_t *iface_to_jsdisp(IUnknown *iface) return ret; } +static void ensure_retval_type(VARIANT *v) +{ + switch(V_VT(v)) { + case VT_I2: + V_VT(v) = VT_I4; + V_I4(v) = V_I2(v); + } +} + HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID *id) { dispex_prop_t *prop; @@ -1203,18 +1212,21 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val } hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(FAILED(hres)) { + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, + &ctx->jscaller->IServiceProvider_iface); + IDispatchEx_Release(dispex); + }else { ULONG err = 0; TRACE("using IDispatch\n"); - return IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, &err); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, &err); } + if(FAILED(hres)) + return hres; - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, - &ctx->jscaller->IServiceProvider_iface); - IDispatchEx_Release(dispex); - - return hres; + ensure_retval_type(val); + return S_OK; } HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx)

1 0

Jacek Caban : jscript: Added support for VT_I2 in invoke_prop_func.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: c9c8c6165eafc91e0c1c11fe5563db613ecc35b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c8c6165eafc91e0c1c11fe5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 1 15:05:07 2012 +0200 jscript: Added support for VT_I2 in invoke_prop_func. --- dlls/jscript/dispex.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/jscript.h | 2 +- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 4f6ed7e..96c17c8 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -333,6 +333,49 @@ static HRESULT set_this(DISPPARAMS *dp, DISPPARAMS *olddp, IDispatch *jsthis) return S_OK; } +static HRESULT convert_params(const DISPPARAMS *dp, VARIANT *buf, DISPPARAMS *ret) +{ + BOOL need_conversion = FALSE; + const VARIANT *s; + VARIANT *d; + unsigned i; + + *ret = *dp; + + for(i = 0; i < ret->cArgs; i++) { + if(V_VT(get_arg(dp, i)) == VT_I2) { + need_conversion = TRUE; + break; + } + } + + if(!need_conversion) + return S_OK; + + if(ret->cArgs > 6) { + ret->rgvarg = heap_alloc(ret->cArgs * sizeof(VARIANT)); + if(!ret->rgvarg) + return E_OUTOFMEMORY; + }else { + ret->rgvarg = buf; + } + + for(i = 0; i < ret->cArgs; i++) { + s = get_arg(dp, i); + d = get_arg(ret, i); + switch(V_VT(s)) { + case VT_I2: + V_VT(d) = VT_I4; + V_I4(d) = V_I2(s); + break; + default: + *d = *s; + } + } + + return S_OK; +} + static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t *prop, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -340,6 +383,8 @@ static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t switch(prop->type) { case PROP_BUILTIN: { + DISPPARAMS params; + VARIANT buf[6]; vdisp_t vthis; if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { @@ -347,9 +392,15 @@ static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t return E_INVALIDARG; } + hres = convert_params(dp, buf, &params); + if(FAILED(hres)) + return hres; + set_jsdisp(&vthis, jsthis); - hres = prop->u.p->invoke(This->ctx, &vthis, flags, dp, retv, ei); + hres = prop->u.p->invoke(This->ctx, &vthis, flags, &params, retv, ei); vdisp_release(&vthis); + if(params.rgvarg != buf && params.rgvarg != dp->rgvarg) + heap_free(params.rgvarg); return hres; } case PROP_PROTREF: diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 65a80e9..ad39b45 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -375,7 +375,7 @@ HRESULT regexp_match(script_ctx_t*,jsdisp_t*,const WCHAR*,DWORD,BOOL,match_resul HRESULT parse_regexp_flags(const WCHAR*,DWORD,DWORD*) DECLSPEC_HIDDEN; HRESULT regexp_string_match(script_ctx_t*,jsdisp_t*,BSTR,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; -static inline VARIANT *get_arg(DISPPARAMS *dp, DWORD i) +static inline VARIANT *get_arg(const DISPPARAMS *dp, DWORD i) { return dp->rgvarg + dp->cArgs-i-1; }

1 0

Jacek Caban : oleaut32: SysStringLen code clean up.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: 7fded8889577385d6595a18b3dd00c73dba23bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fded8889577385d6595a18b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 1 15:06:32 2012 +0200 oleaut32: SysStringLen code clean up. --- dlls/oleaut32/oleaut.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 8cbc819..0d4a07c 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -152,18 +152,7 @@ static DWORD *alloc_bstr(size_t size) */ UINT WINAPI SysStringLen(BSTR str) { - DWORD* bufferPointer; - - if (!str) return 0; - /* - * The length of the string (in bytes) is contained in a DWORD placed - * just before the BSTR pointer - */ - bufferPointer = (DWORD*)str; - - bufferPointer--; - - return (int)(*bufferPointer/sizeof(WCHAR)); + return str ? *((DWORD*)str-1)/sizeof(WCHAR) : 0; } /******************************************************************************

1 0

Alexander E. Patrakov : dsound: Clean up MixToTemporary().
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: 0195e0199059afc28787083ddc5137de845fece7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0195e0199059afc28787083dd… Author: Alexander E. Patrakov <patrakov(a)gmail.com> Date: Mon Nov 7 10:17:09 2011 -0600 dsound: Clean up MixToTemporary(). --- dlls/dsound/dsound_convert.c | 2 +- dlls/dsound/mixer.c | 59 +++++++++++++----------------------------- 2 files changed, 19 insertions(+), 42 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 63e3dbe..dd982c6 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -66,8 +66,8 @@ static inline void src_advance(const void **src, UINT stride, INT *count, UINT * ULONG adv = (*freqAcc >> DSOUND_FREQSHIFT); *freqAcc &= (1 << DSOUND_FREQSHIFT) - 1; *(const char **)src += adv * stride; - *count -= adv; } + *count -= 1; } static void convert_8_to_8 (const void *src, void *dst, UINT src_stride, diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 7d0ea66..1cb7e05 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -138,8 +138,6 @@ DWORD DSOUND_secpos_to_bufpos(const IDirectSoundBufferImpl *dsb, DWORD secpos, D } /** Convert a resampled pointer that fits for primary to a 'native' sample pointer - * freqAccNext is used here rather than freqAcc: In case the app wants to fill up to - * the play position it won't overwrite it */ static DWORD DSOUND_bufpos_to_secpos(const IDirectSoundBufferImpl *dsb, DWORD bufpos) { @@ -148,12 +146,15 @@ static DWORD DSOUND_bufpos_to_secpos(const IDirectSoundBufferImpl *dsb, DWORD bu DWORD64 acc; framelen = bufpos/oAdv; - acc = framelen * (DWORD64)dsb->freqAdjust + (DWORD64)dsb->freqAccNext; + acc = framelen * (DWORD64)dsb->freqAdjust + (DWORD64)dsb->freqAcc; acc = acc >> DSOUND_FREQSHIFT; pos = (DWORD)acc * iAdv; - if (pos >= dsb->buflen) - /* Because of differences between freqAcc and freqAccNext, this might happen */ + if (pos >= dsb->buflen) { + /* FIXME: can this happen at all? */ + ERR("pos >= dsb->buflen: %d >= %d, capping\n", pos, dsb->buflen); pos = dsb->buflen - iAdv; + } + TRACE("Converted %d/%d to %d/%d\n", bufpos, dsb->tmp_buffer_len, pos, dsb->buflen); return pos; } @@ -334,41 +335,32 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2) * * NOTE: writepos + len <= buflen. When called by mixer, MixOne makes sure of this. */ -static void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD len) +static void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD tmp_len) { INT size; - BYTE *ibp, *obp, *obp_begin; + BYTE *ibp, *obp; INT iAdvance = dsb->pwfx->nBlockAlign; INT oAdvance = dsb->device->pwfx->nBlockAlign; - DWORD freqAcc, overshot, maxlen; - - assert(writepos + len <= dsb->buflen); - if (writepos + len < dsb->buflen) - len += dsb->pwfx->nBlockAlign; + DWORD freqAcc; - maxlen = DSOUND_secpos_to_bufpos(dsb, len, 0, NULL); - - ibp = dsb->buffer->memory + writepos; - if (dsb->device->tmp_buffer_len < maxlen || !dsb->device->tmp_buffer) + ibp = dsb->buffer->memory + dsb->sec_mixpos; + if (dsb->device->tmp_buffer_len < tmp_len || !dsb->device->tmp_buffer) { - dsb->device->tmp_buffer_len = maxlen; + dsb->device->tmp_buffer_len = tmp_len; if (dsb->device->tmp_buffer) - dsb->device->tmp_buffer = HeapReAlloc(GetProcessHeap(), 0, dsb->device->tmp_buffer, maxlen); + dsb->device->tmp_buffer = HeapReAlloc(GetProcessHeap(), 0, dsb->device->tmp_buffer, tmp_len); else - dsb->device->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, maxlen); - obp_begin = dsb->device->tmp_buffer; + dsb->device->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, tmp_len); } - else - obp_begin = dsb->device->tmp_buffer; + obp = dsb->device->tmp_buffer; TRACE("(%p, %p)\n", dsb, ibp); - size = len / iAdvance; + size = tmp_len / oAdvance; /* Check for same sample rate */ if (dsb->freq == dsb->device->pwfx->nSamplesPerSec) { TRACE("(%p) Same sample rate %d = primary %d\n", dsb, dsb->freq, dsb->device->pwfx->nSamplesPerSec); - obp = obp_begin; cp_fields(dsb, ibp, obp, iAdvance, oAdvance, size, 0, 1 << DSOUND_FREQSHIFT); return; @@ -377,22 +369,7 @@ static void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD write /* Mix in different sample rates */ TRACE("(%p) Adjusting frequency: %d -> %d\n", dsb, dsb->freq, dsb->device->pwfx->nSamplesPerSec); - DSOUND_secpos_to_bufpos(dsb, writepos, dsb->sec_mixpos, &freqAcc); - overshot = freqAcc >> DSOUND_FREQSHIFT; - if (overshot) - { - if (overshot >= size) - return; - size -= overshot; - writepos += overshot * iAdvance; - if (writepos >= dsb->buflen) - return; - ibp = dsb->buffer->memory + writepos; - freqAcc &= (1 << DSOUND_FREQSHIFT) - 1; - TRACE("Overshot: %d, freqAcc: %04x\n", overshot, freqAcc); - } - - obp = obp_begin; + DSOUND_secpos_to_bufpos(dsb, dsb->sec_mixpos, dsb->sec_mixpos, &freqAcc); /* FIXME: Small problem here when we're overwriting buf_mixpos, it then STILL uses old freqAcc, not sure if it matters or not */ cp_fields(dsb, ibp, obp, iAdvance, oAdvance, size, freqAcc, dsb->freqAdjust); @@ -497,7 +474,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO } /* Resample buffer to temporary buffer specifically allocated for this purpose, if needed */ - DSOUND_MixToTemporary(dsb, dsb->sec_mixpos, DSOUND_bufpos_to_secpos(dsb, dsb->buf_mixpos+len) - dsb->sec_mixpos); + DSOUND_MixToTemporary(dsb, len); ibuf = dsb->device->tmp_buffer; /* Apply volume if needed */

1 0

Alexander E. Patrakov : dsound: Clean up cp_fields.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: ab4ef6636d2e2662a696988000981f70f7ce9fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4ef6636d2e2662a69698800… Author: Alexander E. Patrakov <patrakov(a)gmail.com> Date: Mon Dec 12 14:03:19 2011 -0600 dsound: Clean up cp_fields. --- dlls/dsound/mixer.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 95f8e9f..4f73831 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -269,16 +269,19 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len } /** - * Copy a single frame from the given input buffer to the given output buffer. + * Copy frames from the given input buffer to the given output buffer. * Translate 8 <-> 16 bits and mono <-> stereo */ -static inline void cp_fields(const IDirectSoundBufferImpl *dsb, const BYTE *ibuf, - UINT istride, UINT ostride, UINT count, UINT freqAcc, UINT adj) +static inline void cp_fields(const IDirectSoundBufferImpl *dsb, + UINT ostride, UINT count, UINT freqAcc) { + DWORD ipos = dsb->sec_mixpos; + UINT istride = dsb->pwfx->nBlockAlign; + UINT adj = dsb->freqAdjust; DirectSoundDevice *device = dsb->device; float value; ULONG adv; - DWORD ipos = dsb->sec_mixpos, opos = 0; + DWORD opos = 0; while (count-- > 0) { if (device->pwfx->nChannels == dsb->pwfx->nChannels || @@ -345,13 +348,10 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2) */ static void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD tmp_len) { - INT size; - BYTE *ibp; - INT iAdvance = dsb->pwfx->nBlockAlign; INT oAdvance = dsb->device->pwfx->nBlockAlign; + INT size = tmp_len / oAdvance; DWORD freqAcc; - ibp = dsb->buffer->memory + dsb->sec_mixpos; if (dsb->device->tmp_buffer_len < tmp_len || !dsb->device->tmp_buffer) { dsb->device->tmp_buffer_len = tmp_len; @@ -361,15 +361,12 @@ static void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD tmp_l dsb->device->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, tmp_len); } - TRACE("(%p, %p)\n", dsb, ibp); - size = tmp_len / oAdvance; - /* Check for same sample rate */ if (dsb->freq == dsb->device->pwfx->nSamplesPerSec) { TRACE("(%p) Same sample rate %d = primary %d\n", dsb, dsb->freq, dsb->device->pwfx->nSamplesPerSec); - cp_fields(dsb, ibp, iAdvance, oAdvance, size, 0, 1 << DSOUND_FREQSHIFT); + cp_fields(dsb, oAdvance, size, 0); return; } @@ -379,7 +376,7 @@ static void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD tmp_l DSOUND_secpos_to_bufpos(dsb, dsb->sec_mixpos, dsb->sec_mixpos, &freqAcc); /* FIXME: Small problem here when we're overwriting buf_mixpos, it then STILL uses old freqAcc, not sure if it matters or not */ - cp_fields(dsb, ibp, iAdvance, oAdvance, size, freqAcc, dsb->freqAdjust); + cp_fields(dsb, oAdvance, size, freqAcc); } /** Apply volume to the given soundbuffer from (primary) position writepos and length len

1 0

Alexander E. Patrakov : dsound: Replace convert() functions with get() and put().
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: f88f3d41495bd71e9dd8d7f729b10033ec4c8d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88f3d41495bd71e9dd8d7f72… Author: Alexander E. Patrakov <patrakov(a)gmail.com> Date: Mon Nov 7 10:25:49 2011 -0600 dsound: Replace convert() functions with get() and put(). --- dlls/dsound/dsound_convert.c | 400 ++++++++---------------------------------- dlls/dsound/dsound_private.h | 12 +- dlls/dsound/mixer.c | 77 +++++---- 3 files changed, 123 insertions(+), 366 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f88f3d41495bd71e9dd8d…

1 0