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

Alexandre Julliard : gphoto2.ds: CreateDIBSection doesn' t need a DC for the DIB_RGB_COLORS case.
by Alexandre Julliard 02 May '12

02 May '12

Module: wine Branch: master Commit: a0a95eb0cac36fb3963efe6795c3fc17d2681547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a95eb0cac36fb3963efe679… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 2 12:02:28 2012 +0200 gphoto2.ds: CreateDIBSection doesn't need a DC for the DIB_RGB_COLORS case. --- dlls/gphoto2.ds/ds_image.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index c870ec4..632ff66 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -383,7 +383,6 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin, BITMAPINFO bmpInfo; LPBYTE bits; JSAMPROW samprow, oldsamprow; - HDC dc; FIXME("DG_IMAGE/DAT_IMAGENATIVEXFER/MSG_GET: implemented, but expect program crash due to DIB.\n"); @@ -425,8 +424,7 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin, bmpInfo.bmiHeader.biYPelsPerMeter = 0; bmpInfo.bmiHeader.biClrUsed = 0; bmpInfo.bmiHeader.biClrImportant = 0; - hDIB = CreateDIBSection ((dc = GetDC(activeDS.hwndOwner)), &bmpInfo, - DIB_RGB_COLORS, (LPVOID)&bits, 0, 0); + hDIB = CreateDIBSection (0, &bmpInfo, DIB_RGB_COLORS, (LPVOID)&bits, 0, 0); if (!hDIB) { FIXME("Failed creating DIB.\n"); gp_file_unref (activeDS.file); @@ -454,7 +452,6 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin, HeapFree (GetProcessHeap(), 0, samprow); gp_file_unref (activeDS.file); activeDS.file = NULL; - ReleaseDC (activeDS.hwndOwner, dc); *pHandle = (UINT_PTR)hDIB; activeDS.twCC = TWCC_SUCCESS; activeDS.currentState = 7; @@ -568,7 +565,6 @@ _get_gphoto2_file_as_DIB( struct jpeg_source_mgr xjsm; struct jpeg_decompress_struct jd; struct jpeg_error_mgr jerr; - HDC dc; BITMAPINFO bmpInfo; LPBYTE bits; JSAMPROW samprow, oldsamprow; @@ -636,7 +632,7 @@ _get_gphoto2_file_as_DIB( bmpInfo.bmiHeader.biYPelsPerMeter = 0; bmpInfo.bmiHeader.biClrUsed = 0; bmpInfo.bmiHeader.biClrImportant = 0; - *hDIB = CreateDIBSection ((dc = GetDC(hwnd)), &bmpInfo, DIB_RGB_COLORS, (LPVOID)&bits, 0, 0); + *hDIB = CreateDIBSection(0, &bmpInfo, DIB_RGB_COLORS, (LPVOID)&bits, 0, 0); if (!*hDIB) { FIXME("Failed creating DIB.\n"); gp_file_unref (file); @@ -659,7 +655,6 @@ _get_gphoto2_file_as_DIB( bits = (LPBYTE)(((UINT_PTR)bits + 3) & ~3); samprow = oldsamprow; } - if (hwnd) ReleaseDC (hwnd, dc); HeapFree (GetProcessHeap(), 0, samprow); gp_file_unref (file); return TWRC_SUCCESS;

1 0

Alexandre Julliard : wined3d: CreateDIBSection doesn' t need a DC for the DIB_RGB_COLORS case.
by Alexandre Julliard 02 May '12

02 May '12

Module: wine Branch: master Commit: c054d7bc6f0e63a71b8d7b46aeed1f9d5c875315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c054d7bc6f0e63a71b8d7b46a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 2 12:02:33 2012 +0200 wined3d: CreateDIBSection doesn't need a DC for the DIB_RGB_COLORS case. --- dlls/wined3d/surface.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a80cab2..148c014 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -377,8 +377,6 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) BITMAPINFO *b_info; int extraline = 0; DWORD *masks; - UINT usage; - HDC dc; TRACE("surface %p.\n", surface); @@ -441,7 +439,6 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) switch (surface->resource.format->id) { case WINED3DFMT_B8G8R8_UNORM: - usage = DIB_RGB_COLORS; b_info->bmiHeader.biCompression = BI_RGB; break; @@ -457,7 +454,6 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) case WINED3DFMT_B10G10R10A2_UNORM: case WINED3DFMT_B5G6R5_UNORM: case WINED3DFMT_R16G16B16A16_UNORM: - usage = 0; b_info->bmiHeader.biCompression = BI_BITFIELDS; masks[0] = format->red_mask; masks[1] = format->green_mask; @@ -467,21 +463,13 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) default: /* Don't know palette */ b_info->bmiHeader.biCompression = BI_RGB; - usage = 0; break; } - if (!(dc = GetDC(0))) - { - HeapFree(GetProcessHeap(), 0, b_info); - return HRESULT_FROM_WIN32(GetLastError()); - } - TRACE("Creating a DIB section with size %dx%dx%d, size=%d.\n", b_info->bmiHeader.biWidth, b_info->bmiHeader.biHeight, b_info->bmiHeader.biBitCount, b_info->bmiHeader.biSizeImage); - surface->dib.DIBsection = CreateDIBSection(dc, b_info, usage, &surface->dib.bitmap_data, 0, 0); - ReleaseDC(0, dc); + surface->dib.DIBsection = CreateDIBSection(0, b_info, DIB_RGB_COLORS, &surface->dib.bitmap_data, 0, 0); if (!surface->dib.DIBsection) {

1 0

André Hentschel : winedbg: Complete the Thumb disassembler.
by Alexandre Julliard 02 May '12

02 May '12

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 01 May '12

01 May '12

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

Hans Leidekker : msi: Fix a couple of DispGetParam calls.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 9700e9c7a62b1e9734bcb739a03e321e086bd55d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9700e9c7a62b1e9734bcb739a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 1 12:39:17 2012 +0200 msi: Fix a couple of DispGetParam calls. --- dlls/msi/automation.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 375191e..918572a 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -884,7 +884,7 @@ static HRESULT RecordImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BSTR, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_BSTR, &varg1, puArgErr); if (FAILED(hr)) return hr; if ((ret = MsiRecordSetStringW(This->msiHandle, V_I4(&varg0), V_BSTR(&varg1))) != ERROR_SUCCESS) { @@ -905,7 +905,7 @@ static HRESULT RecordImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_I4, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); if (FAILED(hr)) return hr; if ((ret = MsiRecordSetInteger(This->msiHandle, V_I4(&varg0), V_I4(&varg1))) != ERROR_SUCCESS) { @@ -1340,7 +1340,7 @@ static HRESULT SessionImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BSTR, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_BSTR, &varg1, puArgErr); if (FAILED(hr)) { VariantClear(&varg0); return hr; @@ -1374,7 +1374,7 @@ static HRESULT SessionImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BOOL, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_BOOL, &varg1, puArgErr); if (FAILED(hr)) return hr; if ((ret = MsiSetMode(This->msiHandle, V_I4(&varg0), V_BOOL(&varg1))) != ERROR_SUCCESS) { @@ -1515,7 +1515,7 @@ static HRESULT SessionImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_I4, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); if (FAILED(hr)) { VariantClear(&varg0); return hr;

1 0

Jacek Caban : jscript: Added support for VT_I2 in disp_propget.
by Alexandre Julliard 01 May '12

01 May '12

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 disp_call.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: da125450dadeb859508f05a1227ec93fea338740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da125450dadeb859508f05a12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 1 15:04:51 2012 +0200 jscript: Added support for VT_I2 in disp_call. --- dlls/jscript/dispex.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 3b52145..4f6ed7e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1056,7 +1056,10 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS if(retv) V_VT(retv) = VT_EMPTY; hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(FAILED(hres)) { + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei->ei, &ctx->jscaller->IServiceProvider_iface); + IDispatchEx_Release(dispex); + }else { UINT err = 0; if(flags == DISPATCH_CONSTRUCT) { @@ -1065,13 +1068,15 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS } TRACE("using IDispatch\n"); - return IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, retv, &ei->ei, &err); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, retv, &ei->ei, &err); } - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei->ei, &ctx->jscaller->IServiceProvider_iface); - IDispatchEx_Release(dispex); + if(FAILED(hres)) + return hres; - return hres; + if(retv) + ensure_retval_type(retv); + return S_OK; } HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, VARIANT *val, jsexcept_t *ei)

1 0

Jacek Caban : jscript: Added support for VT_I2 in invoke_prop_func.
by Alexandre Julliard 01 May '12

01 May '12

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 : jscript: Added VT_I2 tests.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 13db9a1662fa0b52d83337e724814a27cc5d97bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=13db9a1662fa0b52d83337e72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 1 15:05:21 2012 +0200 jscript: Added VT_I2 tests. --- dlls/jscript/jsutils.c | 4 +++ dlls/jscript/tests/run.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 4773fc9..5e7e347 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -262,6 +262,8 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret WARN("failed\n"); return throw_type_error(ctx, ei, JS_E_TO_PRIMITIVE, NULL); } + case VT_I2: + assert(0); default: FIXME("Unimplemented for vt %d\n", V_VT(v)); return E_NOTIMPL; @@ -444,6 +446,8 @@ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, double *ret) case VT_BOOL: *ret = V_BOOL(v) ? 1 : 0; break; + case VT_I2: + assert(0); default: FIXME("unimplemented for vt %d\n", V_VT(v)); return E_NOTIMPL; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index c4dfd1d..332b125 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -66,6 +66,7 @@ DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_notexists_d); DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); +DEFINE_EXPECT(global_testargtypes_i); DEFINE_EXPECT(puredisp_prop_d); DEFINE_EXPECT(puredisp_noprop_d); DEFINE_EXPECT(testobj_delete); @@ -99,6 +100,9 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_GLOBAL_TESTPROPDELETE 0x1010 #define DISPID_GLOBAL_ISNULLBSTR 0x1011 #define DISPID_GLOBAL_PROPARGPUT 0x1012 +#define DISPID_GLOBAL_SHORTPROP 0x1013 +#define DISPID_GLOBAL_GETSHORT 0x1014 +#define DISPID_GLOBAL_TESTARGTYPES 0x1015 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -519,6 +523,21 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "shortProp")) { + *pid = DISPID_GLOBAL_SHORTPROP; + return S_OK; + } + + if(!strcmp_wa(bstrName, "getShort")) { + *pid = DISPID_GLOBAL_GETSHORT; + return S_OK; + } + + if(!strcmp_wa(bstrName, "testArgTypes")) { + *pid = DISPID_GLOBAL_TESTARGTYPES; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -903,6 +922,39 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, IDispatchEx_Release(dispex); return S_OK; } + case DISPID_GLOBAL_SHORTPROP: + case DISPID_GLOBAL_GETSHORT: + V_VT(pvarRes) = VT_I2; + V_I2(pvarRes) = 10; + return S_OK; + + case DISPID_GLOBAL_TESTARGTYPES: { + VARIANT args[1]; + DISPPARAMS dp = {args, NULL, 1, 0}; + HRESULT hres; + + CHECK_EXPECT(global_testargtypes_i); + ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg != NULL\n"); + ok(pdp->cArgs == 3, "cArgs = %d\n", pdp->cArgs); + ok(!pvarRes, "pvarRes != NULL\n"); + + ok(V_VT(pdp->rgvarg+1) == VT_I4, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I4(pdp->rgvarg+1) == 10, "V_I4(psp->rgvargs+1) = %d\n", V_I4(pdp->rgvarg)); + + ok(V_VT(pdp->rgvarg+2) == VT_I4, "V_VT(psp->rgvargs+2) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I4(pdp->rgvarg+2) == 10, "V_I4(psp->rgvargs+2) = %d\n", V_I4(pdp->rgvarg+1)); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + + V_VT(args) = VT_I2; + V_I2(args) = 2; + hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + + return S_OK; + } } ok(0, "unexpected call %x\n", id); @@ -1659,6 +1711,10 @@ static BOOL run_tests(void) CHECK_CALLED(global_propargput_d); CHECK_CALLED(global_propargput_i); + SET_EXPECT(global_testargtypes_i); + parse_script_a("testArgTypes(getShort(), shortProp, function(s) {ok(getVT(s) === 'VT_I4', 'not VT_I4');});"); + CHECK_CALLED(global_testargtypes_i); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Jacek Caban : oleaut32: SysStringLen code clean up.
by Alexandre Julliard 01 May '12

01 May '12

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