wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

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

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

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 : 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 : 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

Alexandre Julliard : shdocvw: Get rid of the IDB_IETOOLBAR define, the bitmap is loaded by name.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 831338df0112211f528a207394c996d4c5385e04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831338df0112211f528a20739… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 17 13:33:26 2011 +0100 shdocvw: Get rid of the IDB_IETOOLBAR define, the bitmap is loaded by name. --- dlls/shdocvw/resource.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index 6f5c777..5a24925 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -28,7 +28,6 @@ #define IDC_BROWSE_ADDRESSBAR 1004 #define IDC_BROWSE_STATUSBAR 1005 #define IDC_BROWSE_TOOLBAR 1006 -#define IDB_IETOOLBAR 1007 #define ID_BROWSE_NEW_WINDOW 275 #define ID_BROWSE_OPEN 256

1 0

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

17 Jan '11

Module: wine Branch: master Commit: 00d1915902b74ae06becd7b7cc7f5ad06ba574f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00d1915902b74ae06becd7b7c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 17 10:41:30 2011 +0100 mmdevapi: Use ifaces instead of vtbl pointers in MMDevice. --- dlls/mmdevapi/devenum.c | 51 +++++++++++++++++++++++++-------------------- dlls/mmdevapi/mmdevapi.h | 4 +- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index d375de9..35c6a78 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -171,8 +171,8 @@ static void MMDevice_Create(MMDevice **dev, WCHAR *name, GUID *id, EDataFlow flo return; } lstrcpyW(cur->alname, name); - cur->lpVtbl = &MMDeviceVtbl; - cur->lpEndpointVtbl = &MMEndpointVtbl; + cur->IMMDevice_iface.lpVtbl = &MMDeviceVtbl; + cur->IMMEndpoint_iface.lpVtbl = &MMEndpointVtbl; cur->ref = 0; InitializeCriticalSection(&cur->crst); cur->crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": MMDevice.crst"); @@ -246,9 +246,14 @@ static void MMDevice_Destroy(MMDevice *This) HeapFree(GetProcessHeap(), 0, This); } +static inline MMDevice *impl_from_IMMDevice(IMMDevice *iface) +{ + return CONTAINING_RECORD(iface, MMDevice, IMMDevice_iface); +} + static HRESULT WINAPI MMDevice_QueryInterface(IMMDevice *iface, REFIID riid, void **ppv) { - MMDevice *This = (MMDevice *)iface; + MMDevice *This = impl_from_IMMDevice(iface); TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) @@ -258,7 +263,7 @@ static HRESULT WINAPI MMDevice_QueryInterface(IMMDevice *iface, REFIID riid, voi || IsEqualIID(riid, &IID_IMMDevice)) *ppv = This; else if (IsEqualIID(riid, &IID_IMMEndpoint)) - *ppv = &This->lpEndpointVtbl; + *ppv = &This->IMMEndpoint_iface; if (*ppv) { IUnknown_AddRef((IUnknown*)*ppv); @@ -270,7 +275,7 @@ static HRESULT WINAPI MMDevice_QueryInterface(IMMDevice *iface, REFIID riid, voi static ULONG WINAPI MMDevice_AddRef(IMMDevice *iface) { - MMDevice *This = (MMDevice *)iface; + MMDevice *This = impl_from_IMMDevice(iface); LONG ref; ref = InterlockedIncrement(&This->ref); @@ -280,7 +285,7 @@ static ULONG WINAPI MMDevice_AddRef(IMMDevice *iface) static ULONG WINAPI MMDevice_Release(IMMDevice *iface) { - MMDevice *This = (MMDevice *)iface; + MMDevice *This = impl_from_IMMDevice(iface); LONG ref; ref = InterlockedDecrement(&This->ref); @@ -293,7 +298,7 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls HRESULT hr = E_NOINTERFACE; #ifdef HAVE_OPENAL - MMDevice *This = (MMDevice *)iface; + MMDevice *This = impl_from_IMMDevice(iface); TRACE("(%p)->(%p,%x,%p,%p)\n", iface, riid, clsctx, params, ppv); @@ -385,7 +390,7 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls static HRESULT WINAPI MMDevice_OpenPropertyStore(IMMDevice *iface, DWORD access, IPropertyStore **ppv) { - MMDevice *This = (MMDevice *)iface; + MMDevice *This = impl_from_IMMDevice(iface); TRACE("(%p)->(%x,%p)\n", This, access, ppv); if (!ppv) @@ -395,7 +400,7 @@ static HRESULT WINAPI MMDevice_OpenPropertyStore(IMMDevice *iface, DWORD access, static HRESULT WINAPI MMDevice_GetId(IMMDevice *iface, WCHAR **itemid) { - MMDevice *This = (MMDevice *)iface; + MMDevice *This = impl_from_IMMDevice(iface); WCHAR *str; GUID *id = &This->devguid; static const WCHAR formatW[] = { '{','0','.','0','.','0','.','0','0','0','0','0','0','0','0','}','.', @@ -418,7 +423,7 @@ static HRESULT WINAPI MMDevice_GetId(IMMDevice *iface, WCHAR **itemid) static HRESULT WINAPI MMDevice_GetState(IMMDevice *iface, DWORD *state) { - MMDevice *This = (MMDevice *)iface; + MMDevice *This = impl_from_IMMDevice(iface); TRACE("(%p)->(%p)\n", iface, state); if (!state) @@ -438,32 +443,32 @@ static const IMMDeviceVtbl MMDeviceVtbl = MMDevice_GetState }; -static MMDevice *get_this_from_endpoint(IMMEndpoint *iface) +static inline MMDevice *impl_from_IMMEndpoint(IMMEndpoint *iface) { - return (MMDevice*)((char*)iface - offsetof(MMDevice,lpEndpointVtbl)); + return CONTAINING_RECORD(iface, MMDevice, IMMEndpoint_iface); } static HRESULT WINAPI MMEndpoint_QueryInterface(IMMEndpoint *iface, REFIID riid, void **ppv) { - MMDevice *This = get_this_from_endpoint(iface); - return IMMDevice_QueryInterface((IMMDevice*)This, riid, ppv); + MMDevice *This = impl_from_IMMEndpoint(iface); + return IMMDevice_QueryInterface(&This->IMMDevice_iface, riid, ppv); } static ULONG WINAPI MMEndpoint_AddRef(IMMEndpoint *iface) { - MMDevice *This = get_this_from_endpoint(iface); - return IMMDevice_AddRef((IMMDevice*)This); + MMDevice *This = impl_from_IMMEndpoint(iface); + return IMMDevice_AddRef(&This->IMMDevice_iface); } static ULONG WINAPI MMEndpoint_Release(IMMEndpoint *iface) { - MMDevice *This = get_this_from_endpoint(iface); - return IMMDevice_Release((IMMDevice*)This); + MMDevice *This = impl_from_IMMEndpoint(iface); + return IMMDevice_Release(&This->IMMDevice_iface); } static HRESULT WINAPI MMEndpoint_GetDataFlow(IMMEndpoint *iface, EDataFlow *flow) { - MMDevice *This = get_this_from_endpoint(iface); + MMDevice *This = impl_from_IMMEndpoint(iface); if (!flow) return E_POINTER; *flow = This->flow; @@ -570,7 +575,7 @@ static HRESULT WINAPI MMDevCol_Item(IMMDeviceCollection *iface, UINT n, IMMDevic && (cur->state & This->state) && i++ == n) { - *dev = (IMMDevice *)cur; + *dev = &cur->IMMDevice_iface; IMMDevice_AddRef(*dev); return S_OK; } @@ -1059,9 +1064,9 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa *device = NULL; if (flow == eRender) - *device = (IMMDevice*)MMDevice_def_play; + *device = &MMDevice_def_play->IMMDevice_iface; else if (flow == eCapture) - *device = (IMMDevice*)MMDevice_def_rec; + *device = &MMDevice_def_rec->IMMDevice_iface; else { WARN("Unknown flow %u\n", flow); @@ -1084,7 +1089,7 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA for (i = 0; i < MMDevice_count; ++i) { WCHAR *str; - dev = (IMMDevice*)MMDevice_head[i]; + dev = &MMDevice_head[i]->IMMDevice_iface; IMMDevice_GetId(dev, &str); if (str && !lstrcmpW(str, name)) diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index afe7bba..cf5520c 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -27,8 +27,8 @@ extern HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERT extern HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERTYKEY key, REFPROPVARIANT pv); typedef struct MMDevice { - const IMMDeviceVtbl *lpVtbl; - const IMMEndpointVtbl *lpEndpointVtbl; + IMMDevice IMMDevice_iface; + IMMEndpoint IMMEndpoint_iface; LONG ref; CRITICAL_SECTION crst;

1 0

Michael Stefaniuc : hhctrl.ocx: Use ifaces instead of vtbl pointers in IOleClientSiteImpl.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: f0b20ad4b3eb9b598fe2fcdc8a92e70e5b33b9e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b20ad4b3eb9b598fe2fcdc8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 17 10:36:47 2011 +0100 hhctrl.ocx: Use ifaces instead of vtbl pointers in IOleClientSiteImpl. --- dlls/hhctrl.ocx/webbrowser.c | 111 +++++++++++++++++++++++------------------ 1 files changed, 62 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0b20ad4b3eb9b598fe2f…

1 0

Greg Geldorp : msvcrt/tests: Use different method to determine non-SBCS locale.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 725cb2f3c088aa33ee2d57c856add4f943c44f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725cb2f3c088aa33ee2d57c85… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 16 22:16:06 2011 +0100 msvcrt/tests: Use different method to determine non-SBCS locale. --- dlls/msvcrt/tests/string.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 2a5d4fc..b003f5a 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -20,6 +20,7 @@ #include "wine/test.h" #include "winbase.h" +#include "winnls.h" #include <string.h> #include <mbstring.h> #include <stdlib.h> @@ -194,6 +195,7 @@ static void test_mbcp(void) unsigned char *mbsonlylead = (unsigned char *)"\xb0\0\xb1\xb2 \xb3"; unsigned char buf[16]; int step; + CPINFO cp_info; /* _mbtype tests */ @@ -357,13 +359,14 @@ static void test_mbcp(void) * we hope the current locale to be SBCS because setlocale(LC_ALL, ".1252") seems not to work yet * (as of Wine 0.9.43) */ - if (*p__mb_cur_max == 1) + GetCPInfo(GetACP(), &cp_info); + if (cp_info.MaxCharSize == 1) { expect_eq(mblen((char *)mbstring, 3), 1, int, "%x"); expect_eq(_mbstrlen((char *)mbstring2), 7, int, "%d"); } else - skip("Current locale has double-byte charset - could leave to false positives\n"); + skip("Current locale has double-byte charset - could lead to false positives\n"); _setmbcp(1361); expect_eq(_ismbblead(0x80), 0, int, "%d");

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

← Newer
1
...
38
39
40
41
42
43
44
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2011