January 2011 - Wine-commits

Austin English : libwine: Add missing checks for FreeBSD_kernel.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: b21319231e321f38f6dad362c9d9339e818edfcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21319231e321f38f6dad362c… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jan 15 15:52:50 2011 -0800 libwine: Add missing checks for FreeBSD_kernel. --- libs/wine/ldt.c | 2 +- libs/wine/mmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index c4dcb0e..3098061 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -412,7 +412,7 @@ void wine_ldt_init_fs( unsigned short sel, const LDT_ENTRY *entry ) ldt_info.entry_number = sel >> 3; fill_modify_ldt_struct( &ldt_info, entry ); if ((ret = set_thread_area( &ldt_info ) < 0)) perror( "set_thread_area" ); -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) i386_set_fsbase( wine_ldt_get_base( entry )); #endif } diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index f0665b1..0e02d16 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -372,7 +372,7 @@ void mmap_init(void) char *base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) - (granularity_mask + 1); if (base > user_space_limit) reserve_area( user_space_limit, base ); base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) + (granularity_mask + 1); -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined (__FreeBSD_kernel__) /* Heuristic: assume the stack is near the end of the address */ /* space, this avoids a lot of futile allocation attempts */ end = (char *)(((unsigned long)base + 0x0fffffff) & 0xf0000000);

1 0

Austin English : server: Add missing checks for FreeBSD_kernel.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 599afa06b7cb83d406fdb14ee2b0a163ae7b7898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599afa06b7cb83d406fdb14ee… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jan 15 15:53:24 2011 -0800 server: Add missing checks for FreeBSD_kernel. --- server/ptrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 734ac8e..69747ed 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -219,7 +219,7 @@ static inline int tkill( int tgid, int pid, int sig ) int ret = syscall( SYS_tgkill, tgid, pid, sig ); if (ret < 0 && errno == ENOSYS) ret = syscall( SYS_tkill, pid, sig ); return ret; -#elif defined(__FreeBSD__) && defined(HAVE_THR_KILL2) +#elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__)) && defined(HAVE_THR_KILL2) return thr_kill2( tgid, pid, sig ); #else errno = ENOSYS;

1 0

Austin English : ntdll: Add missing checks for FreeBSD_kernel.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 9832bd6c546b880bb55da486084de8cf77c8d540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9832bd6c546b880bb55da4860… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jan 15 15:53:13 2011 -0800 ntdll: Add missing checks for FreeBSD_kernel. --- dlls/ntdll/nt.c | 2 +- dlls/ntdll/signal_i386.c | 4 +++- dlls/ntdll/signal_x86_64.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ee78aec..6165082 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1173,7 +1173,7 @@ void fill_cpu_info(void) fclose(f); } } -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) { int ret, num; size_t len; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f30a617..aff4509 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -210,6 +210,8 @@ typedef struct trapframe SIGCONTEXT; #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#include <machine/trap.h> + typedef struct sigcontext SIGCONTEXT; #define EAX_sig(context) ((context)->sc_eax) @@ -428,7 +430,7 @@ extern void DECLSPEC_NORETURN __wine_restore_regs( const CONTEXT *context ); enum i386_trap_code { TRAP_x86_UNKNOWN = -1, /* Unknown fault (TRAP_sig not defined) */ -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) TRAP_x86_DIVIDE = T_DIVIDE, /* Division by zero exception */ TRAP_x86_TRCTRAP = T_TRCTRAP, /* Single-step exception */ TRAP_x86_NMI = T_NMI, /* NMI interrupt */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 48f8b6d..4807103 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -136,7 +136,7 @@ extern int arch_prctl(int func, void *ptr); #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.fpregs)) -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) #include <sys/ucontext.h> #define RAX_sig(context) ((context)->uc_mcontext.mc_rax) @@ -2335,7 +2335,7 @@ void signal_init_thread( TEB *teb ) #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); -#elif defined __FreeBSD__ +#elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) amd64_set_gsbase( teb ); #else # error Please define setting %gs for your architecture

1 0

Austin English : loader: Add missing checks for FreeBSD_kernel.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 534196fba934c0cf362f73a9768ed03a8fbfaa3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=534196fba934c0cf362f73a97… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jan 15 15:52:54 2011 -0800 loader: Add missing checks for FreeBSD_kernel. --- loader/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/main.c b/loader/main.c index e19b1bb..8434d81 100644 --- a/loader/main.c +++ b/loader/main.c @@ -174,7 +174,7 @@ static int pre_exec(void) return 1; /* we have a preloader on x86-64 */ } -#elif defined(__FreeBSD__) && defined(__i386__) +#elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__)) && defined(__i386__) static int pre_exec(void) {

1 0

Andrew Nguyen : explorerframe/tests: Free the shell items at the end of the event tests.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 3ed34dc325d7ac7169f8d937bbcb5f90cc255178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed34dc325d7ac7169f8d937b… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jan 16 03:41:20 2011 -0600 explorerframe/tests: Free the shell items at the end of the event tests. Spotted with Valgrind. --- dlls/explorerframe/tests/nstc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 4b23c95..2022828 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -2381,6 +2381,9 @@ static void test_events(void) HeapFree(GetProcessHeap(), 0, pnstceimpl); HeapFree(GetProcessHeap(), 0, pnstceimpl2); } + + IShellItem_Release(psi); + IShellItem_Release(psidesktop); } static void setup_window(void)

1 0

Andrew Nguyen : fusion: Avoid memory leaks on memory allocation failure in parse_display_name.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: e46c66a1f545e0e90f5a2c5c962f4a6464ebdca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46c66a1f545e0e90f5a2c5c9… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jan 16 03:41:27 2011 -0600 fusion: Avoid memory leaks on memory allocation failure in parse_display_name. --- dlls/fusion/asmname.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 54223af..669b7b6 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -562,7 +562,10 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam str = strdupW(szAssemblyName); save = str; if (!str) - return E_OUTOFMEMORY; + { + hr = E_OUTOFMEMORY; + goto done; + } ptr = strchrW(str, ','); if (ptr) *ptr = '\0'; @@ -576,7 +579,10 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam name->name = strdupW(str); if (!name->name) - return E_OUTOFMEMORY; + { + hr = E_OUTOFMEMORY; + goto done; + } if (!ptr) goto done; @@ -622,7 +628,8 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam else if (!lstrcmpW(str, procarch)) { name->procarch = strdupW(ptr); - hr = S_OK; + if (!name->procarch) + hr = E_OUTOFMEMORY; } if (FAILED(hr))

1 0

Andrew Nguyen : gameux: Initialize registry path pointer to NULL in GAMEUX_getAppIdFromGDFPath.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 3e2bf8adb0689ed28786f96f7fa5334fd968cd27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2bf8adb0689ed28786f96f7… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jan 16 03:41:43 2011 -0600 gameux: Initialize registry path pointer to NULL in GAMEUX_getAppIdFromGDFPath. --- dlls/gameux/gamestatistics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 926023b..ecd518f 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -364,7 +364,7 @@ static HRESULT GAMEUX_getAppIdFromGDFPath( HRESULT hr; GAME_INSTALL_SCOPE installScope; GUID instanceId; - LPWSTR lpRegistryPath; + LPWSTR lpRegistryPath = NULL; HKEY hKey; DWORD dwLength = 49*sizeof(WCHAR);/* place for GUID */

1 0

Michael Stefaniuc : jscript: COM cleanup for the IDispatchEx iface.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 3cb9886ea748926d8982a6ef7ff91f6c4a15f384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb9886ea748926d8982a6ef7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 16 21:27:20 2011 +0100 jscript: COM cleanup for the IDispatchEx iface. --- dlls/jscript/dispex.c | 49 ++++++++++++++++++++++++----------------------- dlls/jscript/jscript.h | 10 +++----- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 99fad56..653857c 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -420,21 +420,24 @@ static HRESULT fill_protrefs(jsdisp_t *This) return S_OK; } -#define DISPATCHEX_THIS(iface) DEFINE_THIS(jsdisp_t, IDispatchEx, iface) +static inline jsdisp_t *impl_from_IDispatchEx(IDispatchEx *iface) +{ + return CONTAINING_RECORD(iface, jsdisp_t, IDispatchEx_iface); +} static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = _IDispatchEx_(This); + *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = _IDispatchEx_(This); + *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); - *ppv = _IDispatchEx_(This); + *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_IDispatchJS, riid)) { TRACE("(%p)->(IID_IDispatchJS %p)\n", This, ppv); jsdisp_addref(This); @@ -452,7 +455,7 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -462,7 +465,7 @@ static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface) static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -491,7 +494,7 @@ static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); TRACE("(%p)->(%p)\n", This, pctinfo); @@ -502,7 +505,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -511,7 +514,7 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); UINT i; HRESULT hres; @@ -519,7 +522,7 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, lcid, rgDispId); for(i=0; i < cNames; i++) { - hres = IDispatchEx_GetDispID(_IDispatchEx_(This), rgszNames[i], 0, rgDispId+i); + hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[i], 0, rgDispId+i); if(FAILED(hres)) return hres; } @@ -531,18 +534,18 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return IDispatchEx_InvokeEx(_IDispatchEx_(This), dispIdMember, lcid, wFlags, + return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL); } static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -557,7 +560,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); dispex_prop_t *prop; jsexcept_t jsexcept; HRESULT hres; @@ -623,7 +626,7 @@ static HRESULT delete_prop(dispex_prop_t *prop) static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); dispex_prop_t *prop; HRESULT hres; @@ -645,7 +648,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); dispex_prop_t *prop; TRACE("(%p)->(%x)\n", This, id); @@ -661,14 +664,14 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); FIXME("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); return E_NOTIMPL; } static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); dispex_prop_t *prop; TRACE("(%p)->(%x %p)\n", This, id, pbstrName); @@ -686,7 +689,7 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); dispex_prop_t *iter; HRESULT hres; @@ -718,13 +721,11 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); FIXME("(%p)->(%p)\n", This, ppunk); return E_NOTIMPL; } -#undef DISPATCHEX_THIS - static IDispatchExVtbl DispatchExVtbl = { DispatchEx_QueryInterface, DispatchEx_AddRef, @@ -747,7 +748,7 @@ HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *b { TRACE("%p (%p)\n", dispex, prototype); - dispex->lpIDispatchExVtbl = &DispatchExVtbl; + dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; dispex->ref = 1; dispex->builtin_info = builtin_info; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 429fcd3..06258d3 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -170,7 +170,7 @@ typedef struct { } builtin_info_t; struct jsdisp_t { - const IDispatchExVtbl *lpIDispatchExVtbl; + IDispatchEx IDispatchEx_iface; LONG ref; @@ -184,21 +184,19 @@ struct jsdisp_t { const builtin_info_t *builtin_info; }; -#define _IDispatchEx_(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl) - static inline IDispatch *to_disp(jsdisp_t *jsdisp) { - return (IDispatch*)&jsdisp->lpIDispatchExVtbl; + return (IDispatch*)&jsdisp->IDispatchEx_iface; } static inline void jsdisp_addref(jsdisp_t *jsdisp) { - IDispatchEx_AddRef(_IDispatchEx_(jsdisp)); + IDispatchEx_AddRef(&jsdisp->IDispatchEx_iface); } static inline void jsdisp_release(jsdisp_t *jsdisp) { - IDispatchEx_Release(_IDispatchEx_(jsdisp)); + IDispatchEx_Release(&jsdisp->IDispatchEx_iface); } HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,jsdisp_t*,jsdisp_t**);

1 0

Michael Stefaniuc : jscript: Use ifaces instead of vtbl pointers in JScript .
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 3b1d9d43de90f522534c07eb5e536289c51bb291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b1d9d43de90f522534c07eb5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 16 21:30:46 2011 +0100 jscript: Use ifaces instead of vtbl pointers in JScript. --- dlls/jscript/jscript.c | 177 ++++++++++++++++++++++++------------------------ 1 files changed, 88 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b1d9d43de90f522534c0…

1 0

Michael Stefaniuc : jscript: COM cleanup for the IServiceProvider iface.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 568b0d5c085a320f423b1bf4a77319ec038ead54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=568b0d5c085a320f423b1bf4a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 16 21:32:07 2011 +0100 jscript: COM cleanup for the IServiceProvider iface. --- dlls/jscript/jscript.c | 27 +++++++++++++-------------- dlls/jscript/jscript.h | 2 -- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 84ce836..a17b456 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -154,27 +154,28 @@ static HRESULT set_ctx_site(JScript *This) } typedef struct { - const IServiceProviderVtbl *lpIServiceProviderVtbl; + IServiceProvider IServiceProvider_iface; LONG ref; IServiceProvider *sp; } AXSite; -#define SERVPROV(x) ((IServiceProvider*) &(x)->lpIServiceProviderVtbl) - -#define SERVPROV_THIS(iface) DEFINE_THIS(AXSite, IServiceProvider, iface) +static inline AXSite *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, AXSite, IServiceProvider_iface); +} static HRESULT WINAPI AXSite_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) { - AXSite *This = SERVPROV_THIS(iface); + AXSite *This = impl_from_IServiceProvider(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = SERVPROV(This); + *ppv = &This->IServiceProvider_iface; }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); - *ppv = SERVPROV(This); + *ppv = &This->IServiceProvider_iface; }else { TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -187,7 +188,7 @@ static HRESULT WINAPI AXSite_QueryInterface(IServiceProvider *iface, REFIID riid static ULONG WINAPI AXSite_AddRef(IServiceProvider *iface) { - AXSite *This = SERVPROV_THIS(iface); + AXSite *This = impl_from_IServiceProvider(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -197,7 +198,7 @@ static ULONG WINAPI AXSite_AddRef(IServiceProvider *iface) static ULONG WINAPI AXSite_Release(IServiceProvider *iface) { - AXSite *This = SERVPROV_THIS(iface); + AXSite *This = impl_from_IServiceProvider(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -211,15 +212,13 @@ static ULONG WINAPI AXSite_Release(IServiceProvider *iface) static HRESULT WINAPI AXSite_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { - AXSite *This = SERVPROV_THIS(iface); + AXSite *This = impl_from_IServiceProvider(iface); TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); return IServiceProvider_QueryService(This->sp, guidService, riid, ppv); } -#undef SERVPROV_THIS - static IServiceProviderVtbl AXSiteVtbl = { AXSite_QueryInterface, AXSite_AddRef, @@ -245,11 +244,11 @@ IUnknown *create_ax_site(script_ctx_t *ctx) return NULL; } - ret->lpIServiceProviderVtbl = &AXSiteVtbl; + ret->IServiceProvider_iface.lpVtbl = &AXSiteVtbl; ret->ref = 1; ret->sp = sp; - return (IUnknown*)SERVPROV(ret); + return (IUnknown*)&ret->IServiceProvider_iface; } static inline JScript *impl_from_IActiveScript(IActiveScript *iface) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 06258d3..68c67ec 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -525,5 +525,3 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } - -#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl)))

1 0