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

Henri Verbeet : wined3d: Get rid of IWineD3DVolumeTextureImpl.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: f77c0e36a43e23028548ed1021ec0c1bcf19c0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f77c0e36a43e23028548ed102… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 18:19:34 2011 +0100 wined3d: Get rid of IWineD3DVolumeTextureImpl. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/volume.c | 2 +- dlls/wined3d/volumetexture.c | 26 ++++++++++++-------------- dlls/wined3d/wined3d_private.h | 20 ++++++-------------- 4 files changed, 21 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b009b83..735cbca 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1139,8 +1139,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, enum wined3d_format_id Format, WINED3DPOOL Pool, void *parent, const struct wined3d_parent_ops *parent_ops, IWineD3DBaseTexture **ppVolumeTexture) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DVolumeTextureImpl *object; + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DBaseTextureImpl *object; HRESULT hr; TRACE("(%p) : W(%u) H(%u) D(%u), Lvl(%u) Usage(%#x), Fmt(%u,%s), Pool(%s)\n", This, Width, Height, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3f7090c..a0baef3 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -85,7 +85,7 @@ void volume_add_dirty_box(struct IWineD3DVolumeImpl *volume, const WINED3DBOX *d } } -void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DVolumeTextureImpl *container) +void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DBaseTextureImpl *container) { TRACE("volume %p, container %p.\n", volume, container); diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 22f6c27..07a83c3 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -1,6 +1,4 @@ /* - * IWineD3DVolumeTexture implementation - * * Copyright 2002-2005 Jason Edmeades * Copyright 2002-2005 Raphael Junqueira * Copyright 2005 Oliver Stieber @@ -113,7 +111,7 @@ static const struct wined3d_resource_ops volumetexture_resource_ops = volumetexture_unload, }; -static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) +static void volumetexture_cleanup(IWineD3DBaseTextureImpl *This) { unsigned int i; @@ -141,7 +139,7 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) static HRESULT WINAPI IWineD3DVolumeTextureImpl_QueryInterface(IWineD3DBaseTexture *iface, REFIID riid, LPVOID *ppobj) { - IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IWineD3DBase) @@ -158,7 +156,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_QueryInterface(IWineD3DBaseTextu static ULONG WINAPI IWineD3DVolumeTextureImpl_AddRef(IWineD3DBaseTexture *iface) { - IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; TRACE("(%p) : AddRef increasing from %d\n", This, This->resource.ref); return InterlockedIncrement(&This->resource.ref); } @@ -166,7 +164,7 @@ static ULONG WINAPI IWineD3DVolumeTextureImpl_AddRef(IWineD3DBaseTexture *iface) /* Do not call while under the GL lock. */ static ULONG WINAPI IWineD3DVolumeTextureImpl_Release(IWineD3DBaseTexture *iface) { - IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; ULONG ref; TRACE("(%p) : Releasing from %d\n", This, This->resource.ref); ref = InterlockedDecrement(&This->resource.ref); @@ -182,28 +180,28 @@ static ULONG WINAPI IWineD3DVolumeTextureImpl_Release(IWineD3DBaseTexture *iface static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetPrivateData(IWineD3DBaseTexture *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data(&((IWineD3DVolumeTextureImpl *)iface)->resource, riid, data, data_size, flags); + return resource_set_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, riid, data, data_size, flags); } static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetPrivateData(IWineD3DBaseTexture *iface, REFGUID guid, void *data, DWORD *data_size) { - return resource_get_private_data(&((IWineD3DVolumeTextureImpl *)iface)->resource, guid, data, data_size); + return resource_get_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, guid, data, data_size); } static HRESULT WINAPI IWineD3DVolumeTextureImpl_FreePrivateData(IWineD3DBaseTexture *iface, REFGUID refguid) { - return resource_free_private_data(&((IWineD3DVolumeTextureImpl *)iface)->resource, refguid); + return resource_free_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, refguid); } static DWORD WINAPI IWineD3DVolumeTextureImpl_SetPriority(IWineD3DBaseTexture *iface, DWORD priority) { - return resource_set_priority(&((IWineD3DVolumeTextureImpl *)iface)->resource, priority); + return resource_set_priority(&((IWineD3DBaseTextureImpl *)iface)->resource, priority); } static DWORD WINAPI IWineD3DVolumeTextureImpl_GetPriority(IWineD3DBaseTexture *iface) { - return resource_get_priority(&((IWineD3DVolumeTextureImpl *)iface)->resource); + return resource_get_priority(&((IWineD3DBaseTextureImpl *)iface)->resource); } static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DBaseTexture *iface) @@ -213,14 +211,14 @@ static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DBaseTexture *iface) static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeTextureImpl_GetType(IWineD3DBaseTexture *iface) { - return resource_get_type(&((IWineD3DVolumeTextureImpl *)iface)->resource); + return resource_get_type(&((IWineD3DBaseTextureImpl *)iface)->resource); } static void * WINAPI IWineD3DVolumeTextureImpl_GetParent(IWineD3DBaseTexture *iface) { TRACE("iface %p\n", iface); - return ((IWineD3DVolumeTextureImpl *)iface)->resource.parent; + return ((IWineD3DBaseTextureImpl *)iface)->resource.parent; } static DWORD WINAPI IWineD3DVolumeTextureImpl_SetLOD(IWineD3DBaseTexture *iface, DWORD LODNew) @@ -318,7 +316,7 @@ static const IWineD3DBaseTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_AddDirtyRegion, }; -HRESULT volumetexture_init(IWineD3DVolumeTextureImpl *texture, UINT width, UINT height, +HRESULT volumetexture_init(IWineD3DBaseTextureImpl *texture, UINT width, UINT height, UINT depth, UINT levels, IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f45e9e9..8726e2d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1965,6 +1965,10 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +HRESULT volumetexture_init(IWineD3DBaseTextureImpl *texture, UINT width, UINT height, + UINT depth, UINT levels, IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, + WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + /***************************************************************************** * IWineD3DCubeTexture implementation structure (extends IWineD3DBaseTextureImpl) */ @@ -1986,7 +1990,7 @@ typedef struct IWineD3DVolumeImpl const IWineD3DVolumeVtbl *lpVtbl; struct wined3d_resource resource; - struct IWineD3DVolumeTextureImpl *container; + struct IWineD3DBaseTextureImpl *container; BOOL lockable; BOOL locked; WINED3DBOX lockedBox; @@ -2004,19 +2008,7 @@ HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT UINT height, UINT depth, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; void volume_load(IWineD3DVolumeImpl *volume, UINT level, BOOL srgb_mode) DECLSPEC_HIDDEN; -void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DVolumeTextureImpl *container) DECLSPEC_HIDDEN; - -typedef struct IWineD3DVolumeTextureImpl -{ - /* IUnknown & WineD3DResource/WineD3DBaseTexture Information */ - const IWineD3DBaseTextureVtbl *lpVtbl; - struct wined3d_resource resource; - IWineD3DBaseTextureClass baseTexture; -} IWineD3DVolumeTextureImpl; - -HRESULT volumetexture_init(IWineD3DVolumeTextureImpl *texture, UINT width, UINT height, - UINT depth, UINT levels, IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, - WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DBaseTextureImpl *container) DECLSPEC_HIDDEN; /***************************************************************************** * Structure for DIB Surfaces (GetDC and GDI surfaces)

1 0

Andrew Eikum : include: Add defines for KSDATAFORMAT_SUBTYPE_ALAW and _MULAW.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: b14e4e584102df82e52af19bb2fc16f43db3fe1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14e4e584102df82e52af19bb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 15 15:06:47 2011 -0500 include: Add defines for KSDATAFORMAT_SUBTYPE_ALAW and _MULAW. --- include/ksmedia.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/ksmedia.h b/include/ksmedia.h index da69b31..4027596 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -25,6 +25,8 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); #define KSAUDIO_SPEAKER_DIRECTOUT 0 #define KSAUDIO_SPEAKER_MONO SPEAKER_FRONT_CENTER

1 0

Eric Pouech : winedbg: Added support for printing WCHAR in print_typed_basic.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: acac3cced4e4cb5621aa25e8802990b0fe34cd3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=acac3cced4e4cb5621aa25e88… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 15 21:18:21 2011 +0100 winedbg: Added support for printing WCHAR in print_typed_basic. --- programs/winedbg/memory.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 1c1567b..5a54ec1 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -29,6 +29,7 @@ #include "debugger.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(winedbg); @@ -393,18 +394,23 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) dbg_printf("%Lf", val_real); break; case btChar: + case btWChar: + /* sometimes WCHAR is defined as btChar with size = 2, so discrimate + * Ansi/Unicode based on size, not on basetype + */ if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return; - /* FIXME: should do the same for a Unicode character (size == 2) */ print_char: - if (size == 1 && (val_int < 0x20 || val_int > 0x80)) - dbg_printf("%d", (int)val_int); - else if (size == 2) + if (size == 1 && isprint((char)val_int)) + dbg_printf("'%c'", (char)val_int); + else if (size == 2 && isprintW((WCHAR)val_int)) { WCHAR wch = (WCHAR)val_int; + dbg_printf("'"); dbg_outputW(&wch, 1); + dbg_printf("'"); } else - dbg_printf("'%c'", (char)val_int); + dbg_printf("%d", (int)val_int); break; case btBool: if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return;

1 0

Eric Pouech : winegcc: Correctly manage the -V option ( gcc expects to be among the first ones, with -b).
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 34acd88a2ecea59c7adf760d69b6c033baaa20d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34acd88a2ecea59c7adf760d6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 15 21:17:48 2011 +0100 winegcc: Correctly manage the -V option (gcc expects to be among the first ones, with -b). --- tools/winegcc/winegcc.c | 49 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index dcfe778..9849afd 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -185,6 +185,7 @@ struct options enum target_cpu target_cpu; enum target_platform target_platform; const char *target; + const char *version; int shared; int use_msvcrt; int nostdinc; @@ -283,30 +284,49 @@ static char* get_temp_file(const char* prefix, const char* suffix) return tmp; } +static char* build_tool_name(struct options *opts, const char* base, const char* deflt) +{ + char* str; + + if (opts->target && opts->version) + { + str = strmake("%s-%s-%s", opts->target, base, opts->version); + } + else if (opts->target) + { + str = strmake("%s-%s", opts->target, base); + } + else if (opts->version) + { + str = strmake("%s-%s", base, opts->version); + } + else + str = xstrdup(deflt); + return str; +} + static const strarray* get_translator(struct options *opts) { - const char *str = NULL; + char *str = NULL; strarray *ret; switch(opts->processor) { case proc_cpp: - if (opts->target) str = strmake( "%s-cpp", opts->target ); - else str = CPP; + str = build_tool_name(opts, "cpp", CPP); break; case proc_cc: case proc_as: - if (opts->target) str = strmake( "%s-gcc", opts->target ); - else str = CC; + str = build_tool_name(opts, "gcc", CC); break; case proc_cxx: - if (opts->target) str = strmake( "%s-g++", opts->target ); - else str = CXX; + str = build_tool_name(opts, "g++", CXX); break; default: assert(0); } ret = strarray_fromstring( str, " " ); + free(str); if (opts->force_pointer_size) strarray_add( ret, strmake("-m%u", 8 * opts->force_pointer_size )); return ret; @@ -379,6 +399,8 @@ static void compile(struct options* opts, const char* lang) strarray* comp_args = strarray_alloc(); unsigned int j; int gcc_defs = 0; + char* gcc; + char* gpp; strarray_addall(comp_args, get_translator(opts)); switch(opts->processor) @@ -389,12 +411,16 @@ static void compile(struct options* opts, const char* lang) /* mixing different C and C++ compilers isn't supported in configure anyway */ case proc_cc: case proc_cxx: + gcc = build_tool_name(opts, "gcc", CC); + gpp = build_tool_name(opts, "g++", CXX); for ( j = 0; !gcc_defs && j < comp_args->size; j++ ) { const char *cc = comp_args->base[j]; - gcc_defs = strendswith(cc, "gcc") || strendswith(cc, "g++"); + gcc_defs = strendswith(cc, gcc) || strendswith(cc, gpp); } + free(gcc); + free(gpp); break; } @@ -1114,7 +1140,7 @@ static int is_linker_arg(const char* arg) */ static int is_target_arg(const char* arg) { - return arg[1] == 'b' || arg[2] == 'V'; + return arg[1] == 'b' || arg[1] == 'V'; } @@ -1291,7 +1317,7 @@ int main(int argc, char **argv) raw_linker_arg = 0; if (argv[i][1] == 'c' || argv[i][1] == 'L') raw_compiler_arg = 0; - if (argv[i][1] == 'o' || argv[i][1] == 'b') + if (argv[i][1] == 'o' || argv[i][1] == 'b' || argv[i][1] == 'V') raw_compiler_arg = raw_linker_arg = 0; /* do a bit of semantic analysis */ @@ -1314,6 +1340,9 @@ int main(int argc, char **argv) case 'b': parse_target_option( &opts, option_arg ); break; + case 'V': + opts.version = xstrdup( option_arg ); + break; case 'c': /* compile or assemble */ if (argv[i][2] == 0) opts.compile_only = 1; /* fall through */

1 0

Jörg Höhle : winealsa: Favour HeapAlloc() over malloc().
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: e52f5773e11af076d07f8573fe20fd48cbbf9b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52f5773e11af076d07f8573f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 9 02:23:10 2011 +0100 winealsa: Favour HeapAlloc() over malloc(). --- dlls/winealsa.drv/wavein.c | 22 +++++++++++----------- dlls/winealsa.drv/waveout.c | 32 +++++++++++++------------------- 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 2075805..32442fa 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -369,7 +369,6 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_ALLOCATED; } - wwi->pcm = 0; flags = SND_PCM_NONBLOCK; if ( (err=snd_pcm_open(&pcm, wwi->pcmname, SND_PCM_STREAM_CAPTURE, flags)) < 0 ) @@ -393,7 +392,11 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) hw_params = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_hw_params_sizeof() ); sw_params = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_sw_params_sizeof() ); - + if (!hw_params || !sw_params) + { + ret = MMSYSERR_NOMEM; + goto error; + } snd_pcm_hw_params_any(pcm, hw_params); #define EXIT_ON_ERROR(f,e,txt) do \ @@ -488,14 +491,9 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) ALSA_TraceParameters(hw_params, sw_params, FALSE); /* now, we can save all required data for later use... */ - if ( wwi->hw_params ) - snd_pcm_hw_params_free(wwi->hw_params); - snd_pcm_hw_params_malloc(&(wwi->hw_params)); - snd_pcm_hw_params_copy(wwi->hw_params, hw_params); wwi->dwBufferSize = snd_pcm_frames_to_bytes(pcm, buffer_size); wwi->lpQueuePtr = wwi->lpPlayPtr = wwi->lpLoopPtr = NULL; - wwi->pcm = pcm; ALSA_InitRingMessage(&wwi->msgRing); @@ -519,8 +517,10 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) CloseHandle(wwi->hStartUpEvent); wwi->hStartUpEvent = NULL; - HeapFree( GetProcessHeap(), 0, hw_params ); HeapFree( GetProcessHeap(), 0, sw_params ); + wwi->hw_params = hw_params; + wwi->pcm = pcm; + widNotifyClient(wwi, WIM_OPEN, 0L, 0L); return MMSYSERR_NOERROR; @@ -548,12 +548,12 @@ static DWORD widClose(WORD wDevID) return MMSYSERR_BADDEVICEID; } - if (WInDev[wDevID].pcm == NULL) { + wwi = &WInDev[wDevID]; + if (wwi->pcm == NULL) { WARN("Requested to close already closed device %d!\n", wDevID); return MMSYSERR_BADDEVICEID; } - wwi = &WInDev[wDevID]; if (wwi->lpQueuePtr) { WARN("buffers still playing !\n"); return WAVERR_STILLPLAYING; @@ -563,7 +563,7 @@ static DWORD widClose(WORD wDevID) } ALSA_DestroyRingMessage(&wwi->msgRing); - snd_pcm_hw_params_free(wwi->hw_params); + HeapFree( GetProcessHeap(), 0, wwi->hw_params ); wwi->hw_params = NULL; snd_pcm_close(wwi->pcm); diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 6c50f89..ac3db1a 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -576,7 +576,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) WINE_WAVEDEV* wwo; snd_pcm_t * pcm = NULL; snd_hctl_t * hctl = NULL; - snd_pcm_hw_params_t * hw_params = NULL; + snd_pcm_hw_params_t * hw_params; snd_pcm_sw_params_t * sw_params; snd_pcm_access_t access; snd_pcm_format_t format = -1; @@ -680,8 +680,8 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) } while(0) sw_params = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_sw_params_sizeof() ); - snd_pcm_hw_params_malloc(&hw_params); - if (! hw_params) + hw_params = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_hw_params_sizeof() ); + if (!hw_params || !sw_params) { retcode = MMSYSERR_NOMEM; goto errexit; @@ -797,11 +797,9 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwo->format.Format.nBlockAlign); HeapFree( GetProcessHeap(), 0, sw_params ); - wwo->pcm = pcm; - wwo->hctl = hctl; - if ( wwo->hw_params ) - snd_pcm_hw_params_free(wwo->hw_params); wwo->hw_params = hw_params; + wwo->hctl = hctl; + wwo->pcm = pcm; wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); return MMSYSERR_NOERROR; @@ -816,9 +814,7 @@ errexit: snd_hctl_close(hctl); } - if ( hw_params ) - snd_pcm_hw_params_free(hw_params); - + HeapFree( GetProcessHeap(), 0, hw_params ); HeapFree( GetProcessHeap(), 0, sw_params ); if (wwo->msgRing.ring_buffer_size > 0) ALSA_DestroyRingMessage(&wwo->msgRing); @@ -841,12 +837,12 @@ static DWORD wodClose(WORD wDevID) return MMSYSERR_BADDEVICEID; } - if (WOutDev[wDevID].pcm == NULL) { + wwo = &WOutDev[wDevID]; + if (wwo->pcm == NULL) { WARN("Requested to close already closed device %d!\n", wDevID); return MMSYSERR_BADDEVICEID; } - wwo = &WOutDev[wDevID]; if (wwo->lpQueuePtr) { WARN("buffers still playing !\n"); return WAVERR_STILLPLAYING; @@ -856,20 +852,18 @@ static DWORD wodClose(WORD wDevID) } ALSA_DestroyRingMessage(&wwo->msgRing); - if (wwo->hw_params) - snd_pcm_hw_params_free(wwo->hw_params); + HeapFree( GetProcessHeap(), 0, wwo->hw_params ); wwo->hw_params = NULL; - if (wwo->pcm) - snd_pcm_close(wwo->pcm); - wwo->pcm = NULL; - if (wwo->hctl) { snd_hctl_free(wwo->hctl); snd_hctl_close(wwo->hctl); + wwo->hctl = NULL; } - wwo->hctl = NULL; + + snd_pcm_close(wwo->pcm); + wwo->pcm = NULL; wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); }

1 0

Jacek Caban : mshtml: Wine Gecko 1.2.0 release.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 699e41cdd8bcda1276c98cb6d9dd0503e9465099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=699e41cdd8bcda1276c98cb6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 13:45:29 2011 +0100 mshtml: Wine Gecko 1.2.0 release. --- dlls/appwiz.cpl/addons.c | 8 ++-- dlls/mshtml/htmldoc.c | 4 +- dlls/mshtml/mshtml_private.h | 5 +- dlls/mshtml/mutation.c | 75 +++++++++++++++++++---------- dlls/mshtml/nsembed.c | 9 ++- dlls/mshtml/nsiface.idl | 110 +++++++++++++++++++++++++++++++++-------- dlls/mshtml/nsio.c | 22 ++++++++- 7 files changed, 174 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=699e41cdd8bcda1276c98…

1 0

Jacek Caban : mshtml: Notify parser about script evaluation.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: dc96c688d397eb4ef1392ee6a98f3eb6b176dc56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc96c688d397eb4ef1392ee6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 13:45:46 2011 +0100 mshtml: Notify parser about script evaluation. --- dlls/mshtml/mutation.c | 22 ++++++++++++++++- dlls/mshtml/nsiface.idl | 49 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/exectest.html | 4 +- 3 files changed, 70 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 94217e9..2117e49 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -310,9 +310,10 @@ static nsresult run_end_load(HTMLDocumentNode *This, nsISupports *arg1, nsISuppo return NS_OK; } -static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_iface, nsISupports *arg) +static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_iface, nsISupports *parser_iface) { nsIDOMHTMLScriptElement *nsscript; + nsIParser *nsparser = NULL; nsresult nsres; TRACE("(%p)->(%p)\n", doc, script_iface); @@ -323,7 +324,24 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa return nsres; } + if(parser_iface) { + nsres = nsISupports_QueryInterface(parser_iface, &IID_nsIParser, (void**)&nsparser); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIParser iface: %08x\n", nsres); + nsparser = NULL; + } + } + + if(nsparser) + nsIParser_BeginEvaluatingParserInsertedScript(nsparser); + doc_insert_script(doc->basedoc.window, nsscript); + + if(nsparser) { + nsIParser_EndEvaluatingParserInsertedScript(nsparser); + nsIParser_Release(nsparser); + } + nsIDOMHTMLScriptElement_Release(nsscript); return NS_OK; } @@ -649,7 +667,7 @@ static nsresult NSAPI nsDocumentObserver_DoneAddingChildren(nsIDocumentObserver if(NS_SUCCEEDED(nsres)) { TRACE("script node\n"); - add_script_runner(This, run_insert_script, (nsISupports*)nsscript, NULL); + add_script_runner(This, run_insert_script, (nsISupports*)nsscript, (nsISupports*)aParser); nsIDOMHTMLScriptElement_Release(nsscript); } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 1df22b3..b6367b4 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -150,7 +150,9 @@ typedef nsISupports nsIControllers; typedef nsISupports nsIDOMValidityState; typedef nsISupports nsIPluginInstanceOwner; typedef nsISupports nsIPluginStreamListener; -typedef nsISupports nsIParser; +typedef nsISupports nsIContentSink; +typedef nsISupports nsIParserFilter; +typedef nsISupports nsIDTD; [ object, @@ -2960,6 +2962,51 @@ interface nsIMutationObserver : nsISupports [ object, + uuid(cbc0cbd8-bbb7-46d6-a551-378a6953a714), + local +] +interface nsIParser : nsISupports +{ + typedef int nsDTDMode; + typedef int eParserCommands; + + void SetContentSink(nsIContentSink *aSink); + nsIContentSink *GetContentSink(); + void GetCommand(nsACString *aCommand); + void SetCommand2(const char *aCommand); + void SetCommand(eParserCommands aParserCommand); + void SetDocumentCharset(const nsACString *aCharset, PRInt32 aSource); + void GetDocumentCharset(nsACString *oCharset, PRInt32 *oSource); + void SetParserFilter(nsIParserFilter *aFilter); + nsresult GetChannel(nsIChannel **aChannel); + nsresult GetDTD(nsIDTD **aDTD); + nsresult GetStreamListener(nsIStreamListener **aListener); + nsresult ContinueInterruptedParsing(); + void BlockParser(); + void UnblockParser(); + PRBool IsParserEnabled(); + PRBool IsComplete(); + nsresult Parse(nsIURI *aURL, nsIRequestObserver *aListener, void *aKey, nsDTDMode aMode); + nsresult Parse2(const nsAString *aSourceBuffer, void *aKey, const nsACString *aMimeType, PRBool aLastCall, nsDTDMode aMode); + void *GetRootContextKey(); + nsresult Terminate(); + nsresult ParseFragment(const nsAString *aSourceBuffer, void *aKey, void /*nsTArray<nsString>*/ *aTagStack, + PRBool aXMLMode, const nsACString *aContentType, nsDTDMode aMode); + nsresult ParseFragment2(const nsAString *aSourceBuffer, nsIContent *aTargetNode, nsIAtom *aContextLocalName, + PRInt32 aContextNamespace, PRBool aQuirks); + nsresult BuildModel(); + nsresult CancelParsingEvents(); + void Reset(); + PRBool CanInterrupt(); + PRBool IsInsertionPointDefined(); + void BeginEvaluatingParserInsertedScript(); + void EndEvaluatingParserInsertedScript(); + void MarkAsNotScriptCreated(); + PRBool IsScriptCreated(); +} + +[ + object, uuid(3d005225-210f-4b07-b1d9-96020574c437), local ] diff --git a/dlls/mshtml/tests/exectest.html b/dlls/mshtml/tests/exectest.html index 65d3701..1d84917 100644 --- a/dlls/mshtml/tests/exectest.html +++ b/dlls/mshtml/tests/exectest.html @@ -15,12 +15,12 @@ ok(len === 3, "init length = " + len); document.write("<script>" + "var len = document.getElementsByTagName('div').length;" - + "external.todo_wine_ok(len === 3, 'unexpected length ' + len);" + + "ok(len === 3, 'unexpected length ' + len);" + "executed = true;" + "<" + "/script>"); len = document.getElementsByTagName('script').length; -external.todo_wine_ok(len === 2, "script col length = " + len); +ok(len === 2, "script col length = " + len); ok(executed, "writen script not executed"); external.reportSuccess();

1 0

Alexandre Julliard : gdi32: Add null driver entry point for world transform functions, and move them to mapping.c.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 29c3c528db49af80ed476dfc798c3caa535f8fa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c3c528db49af80ed476dfc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 15 14:03:02 2011 +0100 gdi32: Add null driver entry point for world transform functions, and move them to mapping.c. --- dlls/gdi32/dc.c | 110 ---------------------------------------------- dlls/gdi32/driver.c | 4 +- dlls/gdi32/enhmfdrv/dc.c | 8 +++- dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/mapping.c | 83 ++++++++++++++++++++++++++++++++++ 5 files changed, 93 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29c3c528db49af80ed476…

1 0

Rico Schüller : d3dx9_36: Start effect parsing.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 0dc91c4975245aa4b2634c6f4ca62e5efbf15dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc91c4975245aa4b2634c6f4… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Mar 14 22:53:08 2011 +0100 d3dx9_36: Start effect parsing. --- dlls/d3dx9_36/effect.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 94 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8c3c756..2697782 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -31,8 +31,35 @@ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl; typedef struct ID3DXEffectImpl { ID3DXEffect ID3DXEffect_iface; LONG ref; + + UINT parameter_count; + UINT technique_count; } ID3DXEffectImpl; +static inline void read_dword(const char **ptr, DWORD *d) +{ + memcpy(d, *ptr, sizeof(*d)); + *ptr += sizeof(*d); +} + +static void skip_dword_unknown(const char **ptr, unsigned int count) +{ + unsigned int i; + DWORD d; + + FIXME("Skipping %u unknown DWORDs:\n", count); + for (i = 0; i < count; ++i) + { + read_dword(ptr, &d); + FIXME("\t0x%08x\n", d); + } +} + +static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor) +{ + return (0xfeff0000 | ((major) << 8) | (minor)); +} + static inline ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) { return CONTAINING_RECORD(iface, ID3DXEffectImpl, ID3DXEffect_iface); @@ -853,6 +880,61 @@ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl = ID3DXEffectImpl_SetRawValue }; +static HRESULT d3dx9_parse_effect(ID3DXEffectImpl *effect, const char *data, UINT data_size, DWORD start) +{ + const char *ptr = data + start; + + read_dword(&ptr, &effect->parameter_count); + TRACE("Parameter count: %u\n", effect->parameter_count); + + read_dword(&ptr, &effect->technique_count); + TRACE("Technique count: %u\n", effect->technique_count); + + skip_dword_unknown(&ptr, 2); + + /* todo: Parse parameter */ + + /* todo: Parse techniques */ + + return S_OK; +} + +static HRESULT d3dx9_effect_init(ID3DXEffectImpl *effect, const char *data, SIZE_T data_size) +{ + DWORD tag, offset; + const char *ptr = data; + HRESULT hr; + + effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; + effect->ref = 1; + + read_dword(&ptr, &tag); + TRACE("Tag: %x\n", tag); + + if (tag != d3dx9_effect_version(9, 1)) + { + /* todo: compile hlsl ascii code */ + FIXME("HLSL ascii effects not supported, yet\n"); + + /* Show the start of the shader for debugging info. */ + TRACE("effect:\n%s\n", debugstr_an(data, data_size > 40 ? 40 : data_size)); + } + else + { + read_dword(&ptr, &offset); + TRACE("Offset: %x\n", offset); + + hr = d3dx9_parse_effect(effect, ptr, data_size, offset); + if (hr != S_OK) + { + FIXME("Failed to parse effect.\n"); + return hr; + } + } + + return S_OK; +} + HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, LPCVOID srcdata, UINT srcdatalen, @@ -864,7 +946,8 @@ HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, LPD3DXEFFECT* effect, LPD3DXBUFFER* compilation_errors) { - ID3DXEffectImpl* object; + ID3DXEffectImpl *object; + HRESULT hr; FIXME("(%p, %p, %u, %p, %p, %p, %#x, %p, %p, %p): semi-stub\n", device, srcdata, srcdatalen, defines, include, skip_constants, flags, pool, effect, compilation_errors); @@ -879,18 +962,25 @@ HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, if (!effect) return D3D_OK; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXEffectImpl)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { ERR("Out of memory\n"); return E_OUTOFMEMORY; } - object->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; - object->ref = 1; + hr = d3dx9_effect_init(object, srcdata, srcdatalen); + if (FAILED(hr)) + { + WARN("Failed to initialize shader reflection\n"); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } *effect = &object->ID3DXEffect_iface; + TRACE("Created ID3DXEffect %p\n", object); + return D3D_OK; }

1 0

Michael Stefaniuc : oleaut32/tests: COM cleanup in olepicture.c.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 160c4f96a7f939774c68f29a7da80c85732c06af URL: http://source.winehq.org/git/wine.git/?a=commit;h=160c4f96a7f939774c68f29a7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 15 11:35:36 2011 +0100 oleaut32/tests: COM cleanup in olepicture.c. --- dlls/oleaut32/tests/olepicture.c | 40 +++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 5cc078c..54de1cb 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -25,6 +25,7 @@ #include <float.h> #define COBJMACROS +#define CONST_VTABLE #define NONAMELESSUNION #include "wine/test.h" @@ -169,17 +170,17 @@ static const unsigned char enhmetafile[] = { }; -struct NoStatStreamImpl +typedef struct NoStatStreamImpl { - const IStreamVtbl *lpVtbl; + IStream IStream_iface; LONG ref; HGLOBAL supportHandle; ULARGE_INTEGER streamSize; ULARGE_INTEGER currentPosition; -}; -typedef struct NoStatStreamImpl NoStatStreamImpl; -static NoStatStreamImpl* NoStatStreamImpl_Construct(HGLOBAL hGlobal); +} NoStatStreamImpl; + +static IStream* NoStatStream_Construct(HGLOBAL hGlobal); static void test_pic_with_stream(LPSTREAM stream, unsigned int imgsize) @@ -282,7 +283,7 @@ test_pic(const unsigned char *imgdata, unsigned int imgsize) IStream_Release(stream); /* again with Non Statable and Non Seekable stream */ - stream = (LPSTREAM)NoStatStreamImpl_Construct(hglob); + stream = NoStatStream_Construct(hglob); hglob = 0; /* Non-statable impl always deletes on release */ test_pic_with_stream(stream, 0); @@ -313,7 +314,7 @@ test_pic(const unsigned char *imgdata, unsigned int imgsize) IStream_Release(stream); /* again with Non Statable and Non Seekable stream */ - stream = (LPSTREAM)NoStatStreamImpl_Construct(hglob); + stream = NoStatStream_Construct(hglob); hglob = 0; /* Non-statable impl always deletes on release */ test_pic_with_stream(stream, 0); @@ -1002,6 +1003,11 @@ START_TEST(olepicture) /* Helper functions only ... */ +static inline NoStatStreamImpl *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, NoStatStreamImpl, IStream_iface); +} + static void NoStatStreamImpl_Destroy(NoStatStreamImpl* This) { GlobalFree(This->supportHandle); @@ -1012,7 +1018,7 @@ static void NoStatStreamImpl_Destroy(NoStatStreamImpl* This) static ULONG WINAPI NoStatStreamImpl_AddRef( IStream* iface) { - NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; + NoStatStreamImpl* const This = impl_from_IStream(iface); return InterlockedIncrement(&This->ref); } @@ -1021,7 +1027,7 @@ static HRESULT WINAPI NoStatStreamImpl_QueryInterface( REFIID riid, /* [in] */ void** ppvObject) /* [iid_is][out] */ { - NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; + NoStatStreamImpl* const This = impl_from_IStream(iface); if (ppvObject==0) return E_INVALIDARG; *ppvObject = 0; if (IsEqualIID(&IID_IUnknown, riid)) @@ -1042,7 +1048,7 @@ static HRESULT WINAPI NoStatStreamImpl_QueryInterface( static ULONG WINAPI NoStatStreamImpl_Release( IStream* iface) { - NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; + NoStatStreamImpl* const This = impl_from_IStream(iface); ULONG newRef = InterlockedDecrement(&This->ref); if (newRef==0) NoStatStreamImpl_Destroy(This); @@ -1055,7 +1061,7 @@ static HRESULT WINAPI NoStatStreamImpl_Read( ULONG cb, /* [in] */ ULONG* pcbRead) /* [out] */ { - NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; + NoStatStreamImpl* const This = impl_from_IStream(iface); void* supportBuffer; ULONG bytesReadBuffer; ULONG bytesToReadFromBuffer; @@ -1079,7 +1085,7 @@ static HRESULT WINAPI NoStatStreamImpl_Write( ULONG cb, /* [in] */ ULONG* pcbWritten) /* [out] */ { - NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; + NoStatStreamImpl* const This = impl_from_IStream(iface); void* supportBuffer; ULARGE_INTEGER newSize; ULONG bytesWritten = 0; @@ -1107,7 +1113,7 @@ static HRESULT WINAPI NoStatStreamImpl_Seek( DWORD dwOrigin, /* [in] */ ULARGE_INTEGER* plibNewPosition) /* [out] */ { - NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; + NoStatStreamImpl* const This = impl_from_IStream(iface); ULARGE_INTEGER newPosition; switch (dwOrigin) { @@ -1136,7 +1142,7 @@ static HRESULT WINAPI NoStatStreamImpl_SetSize( IStream* iface, ULARGE_INTEGER libNewSize) /* [in] */ { - NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; + NoStatStreamImpl* const This = impl_from_IStream(iface); HGLOBAL supportHandle; if (libNewSize.u.HighPart != 0) return STG_E_INVALIDFUNCTION; @@ -1249,14 +1255,14 @@ static const IStreamVtbl NoStatStreamImpl_Vtbl; In any case the object takes ownership of memory handle and will free it on object release. */ -static NoStatStreamImpl* NoStatStreamImpl_Construct(HGLOBAL hGlobal) +static IStream* NoStatStream_Construct(HGLOBAL hGlobal) { NoStatStreamImpl* newStream; newStream = HeapAlloc(GetProcessHeap(), 0, sizeof(NoStatStreamImpl)); if (newStream!=0) { - newStream->lpVtbl = &NoStatStreamImpl_Vtbl; + newStream->IStream_iface.lpVtbl = &NoStatStreamImpl_Vtbl; newStream->ref = 1; newStream->supportHandle = hGlobal; @@ -1268,7 +1274,7 @@ static NoStatStreamImpl* NoStatStreamImpl_Construct(HGLOBAL hGlobal) newStream->streamSize.u.HighPart = 0; newStream->streamSize.u.LowPart = GlobalSize(newStream->supportHandle); } - return newStream; + return &newStream->IStream_iface; }

1 0