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

Hans Leidekker : sxs: Implement IAssemblyCache::UninstallAssembly.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 8e70f73a75c7af2a085e226983616f3b1cf6c7cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e70f73a75c7af2a085e22698… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 30 09:34:52 2012 +0200 sxs: Implement IAssemblyCache::UninstallAssembly. --- dlls/sxs/cache.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 104 insertions(+), 11 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index f39c2fd..e0ec0d0 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -92,17 +92,6 @@ static ULONG WINAPI cache_Release( IAssemblyCache *iface ) return refs; } -static HRESULT WINAPI cache_UninstallAssembly( - IAssemblyCache *iface, - DWORD flags, - LPCWSTR name, - LPCFUSION_INSTALL_REFERENCE ref, - ULONG *disp ) -{ - FIXME("%p, 0x%08x, %s, %p, %p\n", iface, flags, debugstr_w(name), ref, disp); - return E_NOTIMPL; -} - static unsigned int build_sxs_path( WCHAR *path ) { static const WCHAR winsxsW[] = {'\\','w','i','n','s','x','s','\\',0}; @@ -697,6 +686,110 @@ done: return hr; } +static HRESULT uninstall_assembly( struct assembly *assembly ) +{ + WCHAR sxsdir[MAX_PATH], *name, *dirname, *filename; + unsigned int len, len_name, len_sxsdir = build_sxs_path( sxsdir ); + HRESULT hr = E_OUTOFMEMORY; + struct file *file; + + name = build_assembly_name( assembly->arch, assembly->name, assembly->token, assembly->version, + &len_name ); + if (!name) return E_OUTOFMEMORY; + if (!(dirname = HeapAlloc( GetProcessHeap(), 0, (len_sxsdir + len_name + 1) * sizeof(WCHAR) ))) + goto done; + strcpyW( dirname, sxsdir ); + strcpyW( dirname + len_sxsdir, name ); + + LIST_FOR_EACH_ENTRY( file, &assembly->files, struct file, entry ) + { + len = len_sxsdir + len_name + 1 + strlenW( file->name ); + if (!(filename = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) goto done; + strcpyW( filename, dirname ); + strcatW( filename, backslashW ); + strcatW( filename, file->name ); + + if (!DeleteFileW( filename )) WARN( "failed to delete file %u\n", GetLastError() ); + HeapFree( GetProcessHeap(), 0, filename ); + } + RemoveDirectoryW( dirname ); + hr = S_OK; + +done: + HeapFree( GetProcessHeap(), 0, dirname ); + HeapFree( GetProcessHeap(), 0, name ); + return hr; +} + +static HRESULT WINAPI cache_UninstallAssembly( + IAssemblyCache *iface, + DWORD flags, + LPCWSTR assembly_name, + LPCFUSION_INSTALL_REFERENCE ref, + ULONG *disp ) +{ + HRESULT hr, init; + IXMLDOMDocument *doc = NULL; + struct assembly *assembly = NULL; + IAssemblyName *name_obj = NULL; + const WCHAR *arch, *name, *token, *type, *version; + WCHAR *p, *path = NULL; + + TRACE("%p, 0x%08x, %s, %p, %p\n", iface, flags, debugstr_w(assembly_name), ref, disp); + + if (ref) + { + FIXME("application reference not supported\n"); + return E_NOTIMPL; + } + init = CoInitialize( NULL ); + + hr = CreateAssemblyNameObject( &name_obj, assembly_name, CANOF_PARSE_DISPLAY_NAME, NULL ); + if (FAILED( hr )) + goto done; + + arch = get_name_attribute( name_obj, NAME_ATTR_ID_ARCH ); + name = get_name_attribute( name_obj, NAME_ATTR_ID_NAME ); + token = get_name_attribute( name_obj, NAME_ATTR_ID_TOKEN ); + type = get_name_attribute( name_obj, NAME_ATTR_ID_TYPE ); + version = get_name_attribute( name_obj, NAME_ATTR_ID_VERSION ); + if (!arch || !name || !token || !type || !version) + { + hr = E_INVALIDARG; + goto done; + } + if (!strcmpW( type, win32W )) path = build_manifest_filename( arch, name, token, version ); + else if (!strcmpW( type, win32_policyW )) path = build_policy_filename( arch, name, token, version ); + else + { + hr = E_INVALIDARG; + goto done; + } + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void **)&doc ); + if (hr != S_OK) + goto done; + + if ((hr = load_manifest( doc, path )) != S_OK) goto done; + if ((hr = parse_assembly( doc, &assembly )) != S_OK) goto done; + + if (!DeleteFileW( path )) WARN( "unable to remove manifest file %u\n", GetLastError() ); + else if ((p = strrchrW( path, '\\' ))) + { + *p = 0; + RemoveDirectoryW( path ); + } + if (!strcmpW( assembly->type, win32W )) hr = uninstall_assembly( assembly ); + +done: + if (name_obj) IAssemblyName_Release( name_obj ); + HeapFree( GetProcessHeap(), 0, path ); + free_assembly( assembly ); + if (doc) IXMLDOMDocument_Release( doc ); + if (SUCCEEDED(init)) CoUninitialize(); + return hr; +} + static const IAssemblyCacheVtbl cache_vtbl = { cache_QueryInterface,

1 0

Hans Leidekker : sxs: Add some helper functions.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: b74f173e2149a4100087176a67b7767ff802a656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74f173e2149a4100087176a6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 30 09:34:30 2012 +0200 sxs: Add some helper functions. --- dlls/sxs/cache.c | 308 +++++++++++++++++++++++++++++++----------------------- 1 files changed, 177 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b74f173e2149a41000871…

1 0

André Hentschel : configure: Check for Thumb2 on ARM and compile always in ARM mode.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 33ca051472db9f6730afedef532901fd29c68be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ca051472db9f6730afedef5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 29 21:43:43 2012 +0200 configure: Check for Thumb2 on ARM and compile always in ARM mode. --- configure | 26 ++++++++++++++++++++++++++ configure.ac | 8 ++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 46827c1..5b8c648 100755 --- a/configure +++ b/configure @@ -4124,6 +4124,32 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi ;; + arm*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports Thumb2" >&5 +$as_echo_n "checking whether $CC supports Thumb2... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int ac_test(int i) { return i; } +int +main () +{ +asm(".syntax unified\n.thumb\nb.w ac_test\n.arm"); if (ac_test(1)) return 1 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "You need a target with Thumb2 support to build Wine for ARM." "$LINENO" 5 +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$CFLAGS -marm" + ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} CFLAGS="$CFLAGS -D_WIN32" diff --git a/configure.ac b/configure.ac index efc03af..18da8c5 100644 --- a/configure.ac +++ b/configure.ac @@ -168,6 +168,14 @@ case $host in AC_SUBST(TARGETFLAGS,"-m64") fi ;; + arm*) + AC_MSG_CHECKING([whether $CC supports Thumb2]) + WINE_TRY_ASM_LINK([".syntax unified\n.thumb\nb.w ac_test\n.arm"],[int ac_test(int i) { return i; }], [if (ac_test(1)) return 1], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([You need a target with Thumb2 support to build Wine for ARM.])]) + CFLAGS="$CFLAGS -marm" + ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} CFLAGS="$CFLAGS -D_WIN32"

1 0

André Hentschel : libwine: Always use Thumb instructions on ARM.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: f93d3ad2f557df43af165468a0910c9d9a3015e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93d3ad2f557df43af165468a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 29 21:43:51 2012 +0200 libwine: Always use Thumb instructions on ARM. --- libs/wine/port.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index da74e85..8e8caf8 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -153,12 +153,7 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "mov sp, r2\n\t" /* stack */ "mov r2, r0\n\t" /* func -> scratch register */ "mov r0, r1\n\t" /* arg */ -#if defined(__thumb__) "blx r2\n\t" /* call func */ -#else - "mov LR, PC\n\t" /* return after branch */ - "mov PC, r2\n\t" /* call func */ -#endif "mov sp, r4\n\t" /* restore old sp from local var */ "pop {r4,PC}") /* fetch return address into pc */ #elif defined(__sparc__) && defined(__GNUC__)

1 0

André Hentschel : ntdll: Correctly handle Thumb exceptions on ARM.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 2a58169dbc41e0110bce7839b52fdd211c9375c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a58169dbc41e0110bce7839b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 29 21:43:02 2012 +0200 ntdll: Correctly handle Thumb exceptions on ARM. --- dlls/ntdll/signal_arm.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 7514b4d..93a2ff5 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -356,20 +356,33 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) return STATUS_SUCCESS; } +extern void raise_func_trampoline_thumb( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func ); +__ASM_GLOBAL_FUNC( raise_func_trampoline_thumb, + ".thumb\n\t" + "blx r2\n\t" + "bkpt") + +extern void raise_func_trampoline_arm( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func ); +__ASM_GLOBAL_FUNC( raise_func_trampoline_arm, + ".arm\n\t" + "blx r2\n\t" + "bkpt") + /*********************************************************************** * setup_exception_record * * Setup the exception record and context on the thread stack. */ -static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *stack_ptr, raise_func func ) +static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func func ) { struct stack_layout { CONTEXT context; EXCEPTION_RECORD rec; - } *stack = stack_ptr; + } *stack; DWORD exception_code = 0; + stack = (struct stack_layout *)(SP_sig(sigcontext) & ~3); stack--; /* push the stack_layout structure */ stack->rec.ExceptionRecord = NULL; @@ -382,9 +395,13 @@ static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *s /* now modify the sigcontext to return to the raise function */ SP_sig(sigcontext) = (DWORD)stack; - PC_sig(sigcontext) = (DWORD)func; + if (CPSR_sig(sigcontext) & 0x20) + PC_sig(sigcontext) = (DWORD)raise_func_trampoline_thumb; + else + PC_sig(sigcontext) = (DWORD)raise_func_trampoline_arm; REGn_sig(0, sigcontext) = (DWORD)&stack->rec; /* first arg for raise_func */ REGn_sig(1, sigcontext) = (DWORD)&stack->context; /* second arg for raise_func */ + REGn_sig(2, sigcontext) = (DWORD)func; /* the raise_func as third arg for the trampoline */ return &stack->rec; @@ -542,7 +559,6 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) { EXCEPTION_RECORD *rec; SIGCONTEXT *context = ucontext; - void *stack = (void *) (SP_sig(context) & ~3); /* check for page fault inside the thread stack */ if (TRAP_sig(context) == TRAP_ARM_PAGEFLT && @@ -553,13 +569,13 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) /* check if this was the last guard page */ if ((char *)info->si_addr < (char *)NtCurrentTeb()->DeallocationStack + 2*4096) { - rec = setup_exception_record( context, stack, raise_segv_exception ); + rec = setup_exception( context, raise_segv_exception ); rec->ExceptionCode = EXCEPTION_STACK_OVERFLOW; } return; } - rec = setup_exception_record( context, stack, raise_segv_exception ); + rec = setup_exception( context, raise_segv_exception ); if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; switch(TRAP_sig(context))

1 0

Aric Stewart : quartz: Have DSoundRenderer use strmbase BasicAudio.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: f58c9661a46e89b9f2e7d8541b7ce8c9f510ca9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58c9661a46e89b9f2e7d8541… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 27 13:47:47 2012 -0500 quartz: Have DSoundRenderer use strmbase BasicAudio. --- dlls/quartz/dsoundrender.c | 69 ++++++-------------------------------------- 1 files changed, 9 insertions(+), 60 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 5d6dac2..071d702 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -53,8 +53,8 @@ static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; typedef struct DSoundRenderImpl { BaseRenderer renderer; + BasicAudio basicAudio; - IBasicAudio IBasicAudio_iface; IReferenceClock IReferenceClock_iface; IAMDirectSound IAMDirectSound_iface; IAMFilterMiscFlags IAMFilterMiscFlags_iface; @@ -88,7 +88,7 @@ static inline DSoundRenderImpl *impl_from_IBaseFilter(IBaseFilter *iface) static inline DSoundRenderImpl *impl_from_IBasicAudio(IBasicAudio *iface) { - return CONTAINING_RECORD(iface, DSoundRenderImpl, IBasicAudio_iface); + return CONTAINING_RECORD(iface, DSoundRenderImpl, basicAudio.IBasicAudio_iface); } static inline DSoundRenderImpl *impl_from_IReferenceClock(IReferenceClock *iface) @@ -666,7 +666,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) hr = BaseRenderer_Init(&pDSoundRender->renderer, &DSoundRender_Vtbl, (IUnknown*)pDSoundRender, &CLSID_DSoundRender, (DWORD_PTR)(__FILE__ ": DSoundRenderImpl.csFilter"), &BaseFuncTable); - pDSoundRender->IBasicAudio_iface.lpVtbl = &IBasicAudio_Vtbl; + BasicAudio_Init(&pDSoundRender->basicAudio,&IBasicAudio_Vtbl); pDSoundRender->IReferenceClock_iface.lpVtbl = &IReferenceClock_Vtbl; pDSoundRender->IAMDirectSound_iface.lpVtbl = &IAMDirectSound_Vtbl; pDSoundRender->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; @@ -722,7 +722,7 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri *ppv = NULL; if (IsEqualIID(riid, &IID_IBasicAudio)) - *ppv = &This->IBasicAudio_iface; + *ppv = &This->basicAudio.IBasicAudio_iface; else if (IsEqualIID(riid, &IID_IReferenceClock)) *ppv = &This->IReferenceClock_iface; else if (IsEqualIID(riid, &IID_IAMDirectSound)) @@ -771,8 +771,7 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) IDirectSound_Release(This->dsound); This->dsound = NULL; - This->IBasicAudio_iface.lpVtbl = NULL; - + BasicAudio_Destroy(&This->basicAudio); CloseHandle(This->blocked); TRACE("Destroying Audio Renderer\n"); @@ -830,56 +829,6 @@ static ULONG WINAPI Basicaudio_Release(IBasicAudio *iface) { return DSoundRender_Release(&This->renderer.filter.IBaseFilter_iface); } -/*** IDispatch methods ***/ -static HRESULT WINAPI Basicaudio_GetTypeInfoCount(IBasicAudio *iface, - UINT*pctinfo) { - DSoundRenderImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->(%p): stub !!!\n", This, iface, pctinfo); - - return S_OK; -} - -static HRESULT WINAPI Basicaudio_GetTypeInfo(IBasicAudio *iface, - UINT iTInfo, - LCID lcid, - ITypeInfo**ppTInfo) { - DSoundRenderImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->(%d, %d, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo); - - return S_OK; -} - -static HRESULT WINAPI Basicaudio_GetIDsOfNames(IBasicAudio *iface, - REFIID riid, - LPOLESTR*rgszNames, - UINT cNames, - LCID lcid, - DISPID*rgDispId) { - DSoundRenderImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); - - return S_OK; -} - -static HRESULT WINAPI Basicaudio_Invoke(IBasicAudio *iface, - DISPID dispIdMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS*pDispParams, - VARIANT*pVarResult, - EXCEPINFO*pExepInfo, - UINT*puArgErr) { - DSoundRenderImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - - return S_OK; -} - /*** IBasicAudio methods ***/ static HRESULT WINAPI Basicaudio_put_Volume(IBasicAudio *iface, LONG lVolume) { @@ -948,10 +897,10 @@ static const IBasicAudioVtbl IBasicAudio_Vtbl = Basicaudio_QueryInterface, Basicaudio_AddRef, Basicaudio_Release, - Basicaudio_GetTypeInfoCount, - Basicaudio_GetTypeInfo, - Basicaudio_GetIDsOfNames, - Basicaudio_Invoke, + BasicAudioImpl_GetTypeInfoCount, + BasicAudioImpl_GetTypeInfo, + BasicAudioImpl_GetIDsOfNames, + BasicAudioImpl_Invoke, Basicaudio_put_Volume, Basicaudio_get_Volume, Basicaudio_put_Balance,

1 0

Aric Stewart : strmbase: Implement BasicAudio.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: a01d6be69fb33d91eae1d03bcac3ae6eb1095870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01d6be69fb33d91eae1d03bc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 27 13:47:39 2012 -0500 strmbase: Implement BasicAudio. --- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/audio.c | 86 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 16 ++++++++ 3 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index f89c2c0..3ac7c56 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,6 +1,7 @@ MODULE = libstrmbase.a C_SRCS = \ + audio.c \ dispatch.c \ dllfunc.c \ enumpins.c \ diff --git a/dlls/strmbase/audio.c b/dlls/strmbase/audio.c new file mode 100644 index 0000000..be99583 --- /dev/null +++ b/dlls/strmbase/audio.c @@ -0,0 +1,86 @@ +/* + * Generic Implementation of strmbase audio classes + * + * Copyright 2012 Aric Stewart, CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <assert.h> +#include "dshow.h" +#include "uuids.h" +#include "vfwmsgs.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/strmbase.h" + +WINE_DEFAULT_DEBUG_CHANNEL(strmbase); + +static inline BasicAudio *impl_from_IBasicAudio(IBasicAudio *iface) +{ + return CONTAINING_RECORD(iface, BasicAudio, IBasicAudio_iface); +} + +HRESULT WINAPI BasicAudio_Init(BasicAudio *pBasicAudio, const IBasicAudioVtbl *lpVtbl) +{ + pBasicAudio->IBasicAudio_iface.lpVtbl = lpVtbl; + BaseDispatch_Init(&pBasicAudio->baseDispatch, &IID_IBasicAudio); + + return S_OK; +} + +HRESULT WINAPI BasicAudio_Destroy(BasicAudio *pBasicAudio) +{ + return BaseDispatch_Destroy(&pBasicAudio->baseDispatch); +} + +HRESULT WINAPI BasicAudioImpl_GetTypeInfoCount(IBasicAudio *iface, UINT *pctinfo) +{ + BasicAudio *This = impl_from_IBasicAudio(iface); + + return BaseDispatchImpl_GetTypeInfoCount(&This->baseDispatch, pctinfo); +} + +HRESULT WINAPI BasicAudioImpl_GetTypeInfo(IBasicAudio *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + BasicAudio *This = impl_from_IBasicAudio(iface); + + return BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, &IID_NULL, iTInfo, lcid, ppTInfo); +} + +HRESULT WINAPI BasicAudioImpl_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + BasicAudio *This = impl_from_IBasicAudio(iface); + + return BaseDispatchImpl_GetIDsOfNames(&This->baseDispatch, riid, rgszNames, cNames, lcid, rgDispId); +} + +HRESULT WINAPI BasicAudioImpl_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) +{ + BasicAudio *This = impl_from_IBasicAudio(iface); + HRESULT hr = S_OK; + ITypeInfo *pTypeInfo; + + hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(pTypeInfo, &This->IBasicAudio_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); + ITypeInfo_Release(pTypeInfo); + } + + return hr; +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 3e749a5..da6475d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -635,6 +635,22 @@ HRESULT WINAPI BaseRendererImpl_ClearPendingSample(BaseRenderer *iface); HRESULT WINAPI BaseRenderer_Init(BaseRenderer *This, const IBaseFilterVtbl *Vtbl, IUnknown *pUnkOuter, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseRendererFuncTable* pBaseFuncsTable); +#ifdef __IBasicAudio_FWD_DEFINED__ +typedef struct tagBasicAudio +{ + IBasicAudio IBasicAudio_iface; + BaseDispatch baseDispatch; +} BasicAudio; + +HRESULT WINAPI BasicAudio_Init(BasicAudio *This, const IBasicAudioVtbl *Vtbl); +HRESULT WINAPI BasicAudio_Destroy(BasicAudio *pBasicAudio); + +HRESULT WINAPI BasicAudioImpl_GetTypeInfoCount(IBasicAudio *iface, UINT*pctinfo); +HRESULT WINAPI BasicAudioImpl_GetTypeInfo(IBasicAudio *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); +HRESULT WINAPI BasicAudioImpl_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); +HRESULT WINAPI BasicAudioImpl_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr); +#endif + /* Dll Functions */ BOOL WINAPI STRMBASE_DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv); HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv);

1 0

Thomas Faber : jscript: Add missing port.h include for isnan.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 58ad6fcf1fafb379b76c0fd66a5021ad9806bcaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ad6fcf1fafb379b76c0fd66… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat Apr 28 09:08:21 2012 +0200 jscript: Add missing port.h include for isnan. --- dlls/jscript/array.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 54dc347..fe8d751 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <math.h> #include "jscript.h"

1 0

Nikolay Sivov : msxml3: Use dispex support for IDispatch implementation of process instruction node .
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 9756cbf70f2a04f97a261425c1a1c1777ea26dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9756cbf70f2a04f97a261425c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 28 11:38:03 2012 +0400 msxml3: Use dispex support for IDispatch implementation of process instruction node. --- dlls/msxml3/pi.c | 49 +++++++------------------------------------------ 1 files changed, 7 insertions(+), 42 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 36ff563..a6034bb 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -126,12 +126,7 @@ static HRESULT WINAPI dom_pi_GetTypeInfoCount( UINT* pctinfo ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - - TRACE("(%p)->(%p)\n", This, pctinfo); - - *pctinfo = 1; - - return S_OK; + return IDispatchEx_GetTypeInfoCount(&This->node.dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI dom_pi_GetTypeInfo( @@ -140,10 +135,8 @@ static HRESULT WINAPI dom_pi_GetTypeInfo( ITypeInfo** ppTInfo ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - return get_typeinfo(IXMLDOMProcessingInstruction_tid, ppTInfo); + return IDispatchEx_GetTypeInfo(&This->node.dispex.IDispatchEx_iface, + iTInfo, lcid, ppTInfo); } static HRESULT WINAPI dom_pi_GetIDsOfNames( @@ -152,23 +145,8 @@ static HRESULT WINAPI dom_pi_GetIDsOfNames( UINT cNames, LCID lcid, DISPID* rgDispId ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - if(!rgszNames || cNames == 0 || !rgDispId) - return E_INVALIDARG; - - hr = get_typeinfo(IXMLDOMProcessingInstruction_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_GetIDsOfNames(&This->node.dispex.IDispatchEx_iface, + riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI dom_pi_Invoke( @@ -178,21 +156,8 @@ static HRESULT WINAPI dom_pi_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - hr = get_typeinfo(IXMLDOMProcessingInstruction_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMProcessingInstruction_iface, dispIdMember, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_Invoke(&This->node.dispex.IDispatchEx_iface, + dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI dom_pi_get_nodeName(

1 0

Hans Leidekker : fusion: CreateAssemblyNameObject is no longer a stub.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 6032b47443062ad47af5c7d77ac7c3ff19440da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6032b47443062ad47af5c7d77… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 30 09:33:58 2012 +0200 fusion: CreateAssemblyNameObject is no longer a stub. --- dlls/fusion/asmname.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index c79690f..4957ae8 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -666,7 +666,7 @@ HRESULT WINAPI CreateAssemblyNameObject(LPASSEMBLYNAME *ppAssemblyNameObj, IAssemblyNameImpl *name; HRESULT hr; - TRACE("(%p, %s, %08x, %p) stub!\n", ppAssemblyNameObj, + TRACE("(%p, %s, %08x, %p)\n", ppAssemblyNameObj, debugstr_w(szAssemblyName), dwFlags, pvReserved); if (!ppAssemblyNameObj)

1 0