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

Ričardas Barkauskas : ddraw: Separate other conversion to IDirectDrawSurfaceImpl from conversions to ifaces .
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 11bf99c5fd8bb2622ddb244786aeca189ea3599e URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bf99c5fd8bb2622ddb24478… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Sat Jun 4 19:13:40 2011 +0300 ddraw: Separate other conversion to IDirectDrawSurfaceImpl from conversions to ifaces. --- dlls/ddraw/surface.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8b4cfa7..895f07b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -146,23 +146,26 @@ static HRESULT WINAPI ddraw_surface3_QueryInterface(IDirectDrawSurface3 *iface, static HRESULT WINAPI ddraw_gamma_control_QueryInterface(IDirectDrawGammaControl *iface, REFIID riid, void **object) { + IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)surface_from_gamma_control(iface), riid, object); + return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)This, riid, object); } static HRESULT WINAPI d3d_texture2_QueryInterface(IDirect3DTexture2 *iface, REFIID riid, void **object) { + IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)surface_from_texture2(iface), riid, object); + return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)This, riid, object); } static HRESULT WINAPI d3d_texture1_QueryInterface(IDirect3DTexture *iface, REFIID riid, void **object) { + IDirectDrawSurfaceImpl *This = surface_from_texture1(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)surface_from_texture1(iface), riid, object); + return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)This, riid, object); } /***************************************************************************** @@ -204,23 +207,26 @@ static ULONG WINAPI ddraw_surface3_AddRef(IDirectDrawSurface3 *iface) static ULONG WINAPI ddraw_gamma_control_AddRef(IDirectDrawGammaControl *iface) { + IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_AddRef((IDirectDrawSurface7 *)surface_from_gamma_control(iface)); + return ddraw_surface7_AddRef((IDirectDrawSurface7 *)This); } static ULONG WINAPI d3d_texture2_AddRef(IDirect3DTexture2 *iface) { + IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_AddRef((IDirectDrawSurface7 *)surface_from_texture2(iface)); + return ddraw_surface7_AddRef((IDirectDrawSurface7 *)This); } static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) { + IDirectDrawSurfaceImpl *This = surface_from_texture1(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_AddRef((IDirectDrawSurface7 *)surface_from_texture1(iface)); + return ddraw_surface7_AddRef((IDirectDrawSurface7 *)This); } /***************************************************************************** @@ -411,23 +417,26 @@ static ULONG WINAPI ddraw_surface3_Release(IDirectDrawSurface3 *iface) static ULONG WINAPI ddraw_gamma_control_Release(IDirectDrawGammaControl *iface) { + IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_Release((IDirectDrawSurface7 *)surface_from_gamma_control(iface)); + return ddraw_surface7_Release((IDirectDrawSurface7 *)This); } static ULONG WINAPI d3d_texture2_Release(IDirect3DTexture2 *iface) { + IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_Release((IDirectDrawSurface7 *)surface_from_texture2(iface)); + return ddraw_surface7_Release((IDirectDrawSurface7 *)This); } static ULONG WINAPI d3d_texture1_Release(IDirect3DTexture *iface) { + IDirectDrawSurfaceImpl *This = surface_from_texture1(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_Release((IDirectDrawSurface7 *)surface_from_texture1(iface)); + return ddraw_surface7_Release((IDirectDrawSurface7 *)This); } /*****************************************************************************

1 0

Ričardas Barkauskas : ddraw: Avoid IDirectDrawSurfaceX to IDirectDrawSurface7 casts.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 4074dd7615c19da2d1f2cb30c5b6a66e58309d90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4074dd7615c19da2d1f2cb30c… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Jun 6 14:03:38 2011 +0300 ddraw: Avoid IDirectDrawSurfaceX to IDirectDrawSurface7 casts. --- dlls/ddraw/ddraw.c | 52 +++++++++++++++++++++++++++++++++++++++++++++----- dlls/ddraw/device.c | 17 +++++++++++++-- 2 files changed, 60 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 56c22f8..0afdd4d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2037,10 +2037,22 @@ static HRESULT WINAPI ddraw7_GetGDISurface(IDirectDraw7 *iface, IDirectDrawSurfa static HRESULT WINAPI ddraw4_GetGDISurface(IDirectDraw4 *iface, IDirectDrawSurface4 **surface) { IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); + IDirectDrawSurface7 *surface7; + IDirectDrawSurfaceImpl *surface_impl; + HRESULT hr; TRACE("iface %p, surface %p.\n", iface, surface); - return ddraw7_GetGDISurface(&This->IDirectDraw7_iface, (IDirectDrawSurface7 **)surface); + hr = ddraw7_GetGDISurface(&This->IDirectDraw7_iface, &surface7); + if (FAILED(hr)) + { + *surface = NULL; + return hr; + } + surface_impl = impl_from_IDirectDrawSurface7(surface7); + *surface = (IDirectDrawSurface4 *)surface_impl; + + return hr; } static HRESULT WINAPI ddraw3_GetGDISurface(IDirectDraw3 *iface, IDirectDrawSurface **surface) @@ -2483,10 +2495,25 @@ static HRESULT WINAPI ddraw3_GetSurfaceFromDC(IDirectDraw3 *iface, HDC dc, IDirectDrawSurface **surface) { IDirectDrawImpl *This = impl_from_IDirectDraw3(iface); + IDirectDrawSurface7 *surface7; + IDirectDrawSurfaceImpl *surface_impl; + HRESULT hr; TRACE("iface %p, dc %p, surface %p.\n", iface, dc, surface); - return ddraw7_GetSurfaceFromDC(&This->IDirectDraw7_iface, dc, (IDirectDrawSurface7 **)surface); + if (!surface) return E_INVALIDARG; + + hr = ddraw7_GetSurfaceFromDC(&This->IDirectDraw7_iface, dc, &surface7); + if (FAILED(hr)) + { + *surface = NULL; + return hr; + } + + surface_impl = impl_from_IDirectDrawSurface7(surface7); + *surface = (IDirectDrawSurface *)&surface_impl->IDirectDrawSurface3_iface; + + return hr; } /***************************************************************************** @@ -4216,11 +4243,23 @@ static HRESULT WINAPI ddraw4_DuplicateSurface(IDirectDraw4 *iface, IDirectDrawSu IDirectDrawSurface4 **dst) { IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); + IDirectDrawSurfaceImpl *src_impl = (IDirectDrawSurfaceImpl *)src; + IDirectDrawSurface7 *dst7; + IDirectDrawSurfaceImpl *dst_impl; + HRESULT hr; TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); + hr = ddraw7_DuplicateSurface(&This->IDirectDraw7_iface, + (IDirectDrawSurface7 *)src_impl, &dst7); + if (FAILED(hr)) + { + *dst = NULL; + return hr; + } + dst_impl = impl_from_IDirectDrawSurface7(dst7); + *dst = (IDirectDrawSurface4 *)dst_impl; - return ddraw7_DuplicateSurface(&This->IDirectDraw7_iface, (IDirectDrawSurface7 *)src, - (IDirectDrawSurface7 **)dst); + return hr; } static HRESULT WINAPI ddraw3_DuplicateSurface(IDirectDraw3 *iface, IDirectDrawSurface *src, @@ -5849,6 +5888,7 @@ static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_pa DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface) { struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); + IDirectDrawSurface7 *ddraw7; IDirectDrawSurfaceImpl *ddraw_surface; DDSURFACEDESC2 ddsd; HRESULT hr; @@ -5877,8 +5917,7 @@ static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_pa } ddraw->depthstencil = TRUE; - hr = IDirectDraw7_CreateSurface(&ddraw->IDirectDraw7_iface, &ddsd, - (IDirectDrawSurface7 **)&ddraw_surface, NULL); + hr = IDirectDraw7_CreateSurface(&ddraw->IDirectDraw7_iface, &ddsd, &ddraw7, NULL); ddraw->depthstencil = FALSE; if (FAILED(hr)) { @@ -5886,6 +5925,7 @@ static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_pa return hr; } + ddraw_surface = impl_from_IDirectDrawSurface7(ddraw7); *surface = ddraw_surface->wined3d_surface; wined3d_surface_incref(*surface); IDirectDrawSurface7_Release((IDirectDrawSurface7 *)ddraw_surface); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 52a5e59..8f9fb81 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1947,12 +1947,19 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetRenderTarget(IDirect3DDevice3 *if IDirectDrawSurface4 **RenderTarget) { IDirect3DDeviceImpl *This = device_from_device3(iface); + IDirectDrawSurface7 *RenderTarget7; + IDirectDrawSurfaceImpl *RenderTargetImpl; HRESULT hr; TRACE("iface %p, target %p.\n", iface, RenderTarget); - hr = IDirect3DDevice7_GetRenderTarget((IDirect3DDevice7 *)This, (IDirectDrawSurface7 **)RenderTarget); + if(!RenderTarget) + return DDERR_INVALIDPARAMS; + + hr = IDirect3DDevice7_GetRenderTarget((IDirect3DDevice7 *)This, &RenderTarget7); if(hr != D3D_OK) return hr; + RenderTargetImpl = impl_from_IDirectDrawSurface7(RenderTarget7); + *RenderTarget = (IDirectDrawSurface4 *)RenderTargetImpl; return D3D_OK; } @@ -1960,14 +1967,18 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetRenderTarget(IDirect3DDevice2 *if IDirectDrawSurface **RenderTarget) { IDirect3DDeviceImpl *This = device_from_device2(iface); + IDirectDrawSurface7 *RenderTarget7; IDirectDrawSurfaceImpl *RenderTargetImpl; HRESULT hr; TRACE("iface %p, target %p.\n", iface, RenderTarget); - hr = IDirect3DDevice7_GetRenderTarget((IDirect3DDevice7 *)This, (IDirectDrawSurface7 **)RenderTarget); + if(!RenderTarget) + return DDERR_INVALIDPARAMS; + + hr = IDirect3DDevice7_GetRenderTarget((IDirect3DDevice7 *)This, &RenderTarget7); if(hr != D3D_OK) return hr; - RenderTargetImpl = (IDirectDrawSurfaceImpl *)RenderTarget; + RenderTargetImpl = impl_from_IDirectDrawSurface7(RenderTarget7); *RenderTarget = (IDirectDrawSurface *)&RenderTargetImpl->IDirectDrawSurface3_iface; return D3D_OK; }

1 0

Ričardas Barkauskas : ddraw: Use impl_from_IDirectDrawSurface7() instead of casts.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 93dfe5afc39147de53f58e99c24b9aad659d46c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93dfe5afc39147de53f58e99c… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Jun 6 13:57:55 2011 +0300 ddraw: Use impl_from_IDirectDrawSurface7() instead of casts. --- dlls/ddraw/ddraw.c | 22 +++++----- dlls/ddraw/ddraw_private.h | 5 ++ dlls/ddraw/device.c | 2 +- dlls/ddraw/main.c | 2 +- dlls/ddraw/surface.c | 96 ++++++++++++++++++++++---------------------- 5 files changed, 66 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93dfe5afc39147de53f58…

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirectDrawSurface7() for application provided interfaces.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 28ce1c00a7dd1b453ca97e727090206a11f2d08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ce1c00a7dd1b453ca97e727… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Jun 6 12:30:23 2011 +0300 ddraw: Use unsafe_impl_from_IDirectDrawSurface7() for application provided interfaces. --- dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 24 ++++++++++++------------ dlls/ddraw/surface.c | 21 ++++++++++++++------- 4 files changed, 30 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28ce1c00a7dd1b453ca97…

1 0

Jörg Höhle : winealsa: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat.
by Alexandre Julliard June 6, 2011

June 6, 2011

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

Alexandre Julliard : widl: Add support for generating new-style interpreted stubs for clients.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: e95d5a8e3cafbe41f4585907cf20384166c53093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95d5a8e3cafbe41f4585907c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 14:54:14 2011 +0200 widl: Add support for generating new-style interpreted stubs for clients. --- tools/widl/client.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 452b883..ea0c2cc 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -107,8 +107,10 @@ static void write_function_stub( const type_t *iface, const var_t *func, fprintf(client, "{\n"); indent++; if (has_ret) print_client( "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); - print_client( "%sNdrClientCall( &%s_StubDesc, &__MIDL_ProcFormatString.Format[%u], ", - has_ret ? "_RetVal = " : "", iface->name, proc_offset ); + print_client( "%s%s( &%s_StubDesc, &__MIDL_ProcFormatString.Format[%u], ", + has_ret ? "_RetVal = " : "", + stub_mode == MODE_Oif ? "NdrClientCall2" : "NdrClientCall", + iface->name, proc_offset ); if (args) fprintf( client, "(unsigned char *)&%s );\n", LIST_ENTRY( list_head(args), const var_t, entry )->name ); @@ -383,7 +385,7 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) print_client("0,\n"); print_client("__MIDL_TypeFormatString.Format,\n"); print_client("1, /* -error bounds_check flag */\n"); - print_client("0x10001, /* Ndr library version */\n"); + print_client("0x%x, /* Ndr library version */\n", stub_mode == MODE_Oif ? 0x50002 : 0x10001); print_client("0,\n"); print_client("0x50100a4, /* MIDL Version 5.1.164 */\n"); print_client("0,\n");

1 0

Alexandre Julliard : widl: Add support for generating new-style interpreted stubs for servers.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 39b15066b052cc098eb8ec52056ee2b49d12b1a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b15066b052cc098eb8ec520… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 16:28:25 2011 +0200 widl: Add support for generating new-style interpreted stubs for servers. --- tools/widl/server.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 46bb771..1c1bc49 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -270,7 +270,7 @@ static void write_dispatchtable(type_t *iface) { var_t *func = stmt->u.var; if (is_interpreted_func( iface, func )) - print_server("NdrServerCall,\n"); + print_server("%s,\n", stub_mode == MODE_Oif ? "NdrServerCall2" : "NdrServerCall"); else print_server("%s_%s,\n", iface->name, get_name(func)); method_count++; @@ -354,7 +354,7 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) print_server("0,\n"); print_server("__MIDL_TypeFormatString.Format,\n"); print_server("1, /* -error bounds_check flag */\n"); - print_server("0x10001, /* Ndr library version */\n"); + print_server("0x%x, /* Ndr library version */\n", stub_mode == MODE_Oif ? 0x50002 : 0x10001); print_server("0,\n"); print_server("0x50100a4, /* MIDL Version 5.1.164 */\n"); print_server("0,\n");

1 0

Piotr Caban : msvcrt: Fixed buffer overflow in snprintf functions family.
by Alexandre Julliard June 6, 2011

June 6, 2011

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

Alexandre Julliard : widl: Add support for new-style interpreted stubs in the proc format strings.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: b724138bd9cad0ecb55186b20406ed7f66bf3d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b724138bd9cad0ecb55186b20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 14:54:14 2011 +0200 widl: Add support for new-style interpreted stubs in the proc format strings. --- tools/widl/typegen.c | 384 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 336 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b724138bd9cad0ecb5518…

1 0

Jörg Höhle : wineoss: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat.
by Alexandre Julliard June 6, 2011

June 6, 2011

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