June 2011 - Wine-commits - list.winehq.org

Ričardas Barkauskas : ddraw: Change lpVtbl to IDirectDrawSurface7_iface.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 2f02bbb41fce3ee3eb8fe89a8eac24927bd4f11c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f02bbb41fce3ee3eb8fe89a8… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Sun Jun 5 19:55:04 2011 +0300 ddraw: Change lpVtbl to IDirectDrawSurface7_iface. --- dlls/ddraw/ddraw.c | 36 +++++++----- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 66 +++++++++++---------- dlls/ddraw/surface.c | 140 ++++++++++++++++++++++---------------------- 4 files changed, 128 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f02bbb41fce3ee3eb8fe…

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirectDrawSurface4.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 4582562f5504e4edf8bccaa9255924f69ddf7f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4582562f5504e4edf8bccaa92… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Jun 6 14:08:23 2011 +0300 ddraw: Use unsafe_impl_from_IDirectDrawSurface4. --- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 7 +++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a8f5418..a265afd 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4243,7 +4243,7 @@ static HRESULT WINAPI ddraw4_DuplicateSurface(IDirectDraw4 *iface, IDirectDrawSu IDirectDrawSurface4 **dst) { IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); - IDirectDrawSurfaceImpl *src_impl = (IDirectDrawSurfaceImpl *)src; + IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface4(src); IDirectDrawSurface7 *dst7; IDirectDrawSurfaceImpl *dst_impl; HRESULT hr; @@ -4879,7 +4879,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, IDirectDrawSurface4 *surface, IDirect3DDevice3 **device, IUnknown *outer_unknown) { IDirectDrawImpl *This = impl_from_IDirect3D3(iface); - IDirectDrawSurfaceImpl *surface_impl = (IDirectDrawSurfaceImpl *)surface; + IDirectDrawSurfaceImpl *surface_impl = unsafe_impl_from_IDirectDrawSurface4(surface); HRESULT hr; TRACE("iface %p, riid %s, surface %p, device %p, outer_unknown %p.\n", diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 3a8ba04..ff7e2ed 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -231,6 +231,7 @@ static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawSurface7(IDirectDrawS } IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) DECLSPEC_HIDDEN; +IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 *iface) DECLSPEC_HIDDEN; /* Get the number of bytes per pixel for a given surface */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e0569e7..28477b0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1889,7 +1889,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_SetRenderTarget(IDirect3DDevice3 *if IDirectDrawSurface4 *NewRenderTarget, DWORD Flags) { IDirect3DDeviceImpl *This = device_from_device3(iface); - IDirectDrawSurfaceImpl *Target = (IDirectDrawSurfaceImpl *)NewRenderTarget; + IDirectDrawSurfaceImpl *Target = unsafe_impl_from_IDirectDrawSurface4(NewRenderTarget); TRACE("iface %p, target %p, flags %#x.\n", iface, NewRenderTarget, Flags); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f5f5ceb..5e57518 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3465,6 +3465,13 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface7_iface); } +IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == (struct IDirectDrawSurface4Vtbl *)&ddraw_surface7_vtbl); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface7_iface); +} + IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) { if (!iface) return NULL;

1 0

Ričardas Barkauskas : ddraw: Separate IDirectDrawSurface4 vtable.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: bb063b994cd3ee05815994e88e339c84a1598847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb063b994cd3ee05815994e88… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Jun 6 14:39:04 2011 +0300 ddraw: Separate IDirectDrawSurface4 vtable. --- dlls/ddraw/ddraw.c | 6 +- dlls/ddraw/ddraw_private.h | 6 + dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 505 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 511 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb063b994cd3ee0581599…

1 0

Jörg Höhle : mmdevapi/tests: Fix wrong buffer unit and memory leaks.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: c192041204436ebab5f3b20542f225920fa1de5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c192041204436ebab5f3b2054… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Jun 3 19:48:57 2011 +0200 mmdevapi/tests: Fix wrong buffer unit and memory leaks. --- dlls/mmdevapi/tests/render.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index c0507fe..b0d0c6c 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -371,6 +371,8 @@ static void test_references(void) 0, pwfx, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); + CoTaskMemFree(pwfx); + hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); ok(hr == S_OK, "GetService failed: %08x\n", hr); @@ -467,7 +469,7 @@ static void test_padding(void) hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); ok(hr == S_OK, "GetService failed: %08x\n", hr); - psize = (defp / 10000000.) * pwfx->nSamplesPerSec * pwfx->nBlockAlign; + psize = (defp / 10000000.) * pwfx->nSamplesPerSec * 10; written = 0; hr = IAudioClient_GetCurrentPadding(ac, &pad); @@ -487,7 +489,7 @@ static void test_padding(void) ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written); - psize = (minp / 10000000.) * pwfx->nSamplesPerSec * pwfx->nBlockAlign; + psize = (minp / 10000000.) * pwfx->nSamplesPerSec * 10; hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); @@ -645,6 +647,8 @@ static void test_clock(void) ok(hr == S_OK, "GetPosition failed: %08x\n", hr); ok(pos >= last, "Position should have been further along...\n"); + CoTaskMemFree(pwfx); + IAudioClock_Release(acl); IAudioClient_Release(ac); }

1 0

Jörg Höhle : winealsa: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: d726cf881941afa61d6e5f976d0880be01d06919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d726cf881941afa61d6e5f976… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jun 4 11:55:06 2011 +0200 winealsa: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat. --- dlls/winealsa.drv/mmdevdrv.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 1a6d58f..f49df77 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1217,16 +1217,15 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(!pwfx) return E_POINTER; + *pwfx = NULL; - *pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEXTENSIBLE)); - if(!*pwfx) + fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); + if(!fmt) return E_OUTOFMEMORY; - fmt = (WAVEFORMATEXTENSIBLE*)*pwfx; - formats = HeapAlloc(GetProcessHeap(), 0, snd_pcm_format_mask_sizeof()); if(!formats){ - HeapFree(GetProcessHeap(), 0, *pwfx); + CoTaskMemFree(fmt); return E_OUTOFMEMORY; } @@ -1310,11 +1309,12 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); dump_fmt((WAVEFORMATEX*)fmt); + *pwfx = (WAVEFORMATEX*)fmt; exit: LeaveCriticalSection(&This->lock); if(FAILED(hr)) - HeapFree(GetProcessHeap(), 0, *pwfx); + CoTaskMemFree(fmt); HeapFree(GetProcessHeap(), 0, formats); return hr;

1 0

Jörg Höhle : winecoreaudio: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 8337ffb727265c38bbbd81cf9d3da7b61832507a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8337ffb727265c38bbbd81cf9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jun 5 10:26:57 2011 +0200 winecoreaudio: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat. --- dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 9075aa8..2819ca7 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1155,13 +1155,12 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(!pwfx) return E_POINTER; + *pwfx = NULL; - *pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEXTENSIBLE)); - if(!*pwfx) + fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); + if(!fmt) return E_OUTOFMEMORY; - fmt = (WAVEFORMATEXTENSIBLE*)*pwfx; - fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; addr.mScope = This->scope; @@ -1170,21 +1169,21 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, &size); if(sc != noErr){ - HeapFree(GetProcessHeap(), 0, fmt); + CoTaskMemFree(fmt); WARN("Unable to get size for _StreamConfiguration property: %lx\n", sc); return E_FAIL; } buffers = HeapAlloc(GetProcessHeap(), 0, size); if(!buffers){ - HeapFree(GetProcessHeap(), 0, fmt); + CoTaskMemFree(fmt); return E_OUTOFMEMORY; } sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, buffers); if(sc != noErr){ - HeapFree(GetProcessHeap(), 0, fmt); + CoTaskMemFree(fmt); HeapFree(GetProcessHeap(), 0, buffers); WARN("Unable to get _StreamConfiguration property: %lx\n", sc); return E_FAIL; @@ -1202,7 +1201,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, size = sizeof(Float64); sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, &rate); if(sc != noErr){ - HeapFree(GetProcessHeap(), 0, fmt); + CoTaskMemFree(fmt); WARN("Unable to get _NominalSampleRate property: %lx\n", sc); return E_FAIL; } @@ -1221,6 +1220,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->Samples.wValidBitsPerSample = fmt->Format.wBitsPerSample; fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + *pwfx = (WAVEFORMATEX*)fmt; dump_fmt(*pwfx); return S_OK;

1 0

Jörg Höhle : wineoss: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: f68a36c87b475a53f3dcc5080a12e87d40399308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f68a36c87b475a53f3dcc5080… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jun 5 10:32:10 2011 +0200 wineoss: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat. --- dlls/wineoss.drv/mmdevdrv.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index b372b64..7e354fe 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1025,12 +1025,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(!pwfx) return E_POINTER; - - *pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEXTENSIBLE)); - if(!*pwfx) - return E_OUTOFMEMORY; - - fmt = (WAVEFORMATEXTENSIBLE*)*pwfx; + *pwfx = NULL; if(This->dataflow == eRender) formats = This->ai.oformats; @@ -1039,6 +1034,10 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, else return E_UNEXPECTED; + fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); + if(!fmt) + return E_OUTOFMEMORY; + fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; if(formats & AFMT_S16_LE){ fmt->Format.wBitsPerSample = 16; @@ -1059,6 +1058,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; }else{ ERR("Didn't recognize any available OSS formats: %x\n", formats); + CoTaskMemFree(fmt); return E_FAIL; } @@ -1074,6 +1074,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->Samples.wValidBitsPerSample = fmt->Format.wBitsPerSample; fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + *pwfx = (WAVEFORMATEX*)fmt; dump_fmt(*pwfx); return S_OK;

1 0

Jörg Höhle : winecoreaudio: mmdevapi' s mixer format is 32bit floating point.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: fd2d6f39283d021dc89fdda25bb552e9df2b73b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd2d6f39283d021dc89fdda25… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Jun 6 07:59:44 2011 +0200 winecoreaudio: mmdevapi's mixer format is 32bit floating point. --- dlls/winecoreaudio.drv/mmdevdrv.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 2819ca7..ed97e99 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1207,10 +1207,8 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, } fmt->Format.nSamplesPerSec = rate; - /* CoreAudio doesn't seem to give a device format preference, so just - * choose a common format... */ - fmt->Format.wBitsPerSample = 16; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + fmt->Format.wBitsPerSample = 32; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; fmt->Format.nBlockAlign = (fmt->Format.wBitsPerSample * fmt->Format.nChannels) / 8;

1 0

Huw Davies : winex11: Move the code that checks for a colortable based dib to a separate function .
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 129021a0ab10e42cec9c16aa8049d229876de290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129021a0ab10e42cec9c16aa8… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 6 12:58:42 2011 +0100 winex11: Move the code that checks for a colortable based dib to a separate function. --- dlls/winex11.drv/xrender.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 52e7f25..48ecd22 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1788,6 +1788,22 @@ static int XRenderErrorHandler(Display *dpy, XErrorEvent *event, void *arg) return 1; } +/******************************************************************** + * is_dib_with_colortable + * + * Return TRUE if physdev is backed by a dibsection with <= 8 bits per pixel + */ +static inline BOOL is_dib_with_colortable( X11DRV_PDEVICE *physDev ) +{ + DIBSECTION dib; + + if( physDev->bitmap && GetObjectW( physDev->bitmap->hbitmap, sizeof(dib), &dib ) == sizeof(dib) && + dib.dsBmih.biBitCount <= 8 ) + return TRUE; + + return FALSE; +} + /*********************************************************************** * X11DRV_XRender_ExtTextOut */ @@ -1803,16 +1819,12 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag HRGN saved_region = 0; BOOL disable_antialias = FALSE; AA_Type aa_type = AA_None; - DIBSECTION bmp; unsigned int idx; const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); Picture tile_pict = 0; - /* Do we need to disable antialiasing because of palette mode? */ - if( !physDev->bitmap || GetObjectW( physDev->bitmap->hbitmap, sizeof(bmp), &bmp ) != sizeof(bmp) ) { - TRACE("bitmap is not a DIB\n"); - } - else if (bmp.dsBmih.biBitCount <= 8) { + if(is_dib_with_colortable( physDev )) + { TRACE("Disabling antialiasing\n"); disable_antialias = TRUE; }

1 0

Piotr Caban : msvcrt: Fixed buffer overflow in snprintf functions family.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: ab9077d64084b51d2807fe807ea4641ab8d41419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9077d64084b51d2807fe807… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 6 14:02:30 2011 +0200 msvcrt: Fixed buffer overflow in snprintf functions family. Spotted by Andrew Miller. --- dlls/msvcrt/printf.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index a69e8f8..eefecd1 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -56,6 +56,7 @@ static int FUNC_NAME(puts_clbk_str)(void *ctx, int len, const APICHAR *str) memcpy(out->buf, str, len*sizeof(APICHAR)); out->buf += len; + out->len -= len; return len; }

1 0