December 2010 - Wine-Commits

Alexandre Julliard : loader: Build the preloader for x86-64.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 0a0862001bb446e473324b121ae6e5a743fd96e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a0862001bb446e473324b121… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 16:54:15 2010 +0100 loader: Build the preloader for x86-64. --- .gitignore | 1 + configure | 11 ++-- configure.ac | 10 ++-- loader/Makefile.in | 9 ++-- loader/main.c | 7 +++ loader/preloader.c | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 166 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 16370d3..95b9fe9 100644 --- a/.gitignore +++ b/.gitignore @@ -262,6 +262,7 @@ loader/wine loader/wine-installed loader/wine-preloader loader/wine64 +loader/wine64-preloader programs/Makeprog.rules programs/rpcss/epm.h programs/rpcss/epm_s.c diff --git a/configure b/configure index c1256ba..18ec4a7 100755 --- a/configure +++ b/configure @@ -12736,11 +12736,12 @@ MAIN_BINARY="wine" test "x$enable_win64" != "xyes" || MAIN_BINARY="wine64" -case $host_cpu in - *i[3456789]86*) - case $host_os in - linux*) - EXTRA_BINARIES="wine-preloader" +case $host_os in + linux*) + case $host_cpu in + *i[3456789]86*) EXTRA_BINARIES="wine-preloader" + ;; + x86_64*) EXTRA_BINARIES="wine64-preloader" ;; esac ;; diff --git a/configure.ac b/configure.ac index 71c14d3..012df93 100644 --- a/configure.ac +++ b/configure.ac @@ -1863,11 +1863,11 @@ esac AC_SUBST(MAIN_BINARY,"wine") test "x$enable_win64" != "xyes" || MAIN_BINARY="wine64" -case $host_cpu in - *i[[3456789]]86*) - case $host_os in - linux*) - AC_SUBST(EXTRA_BINARIES,"wine-preloader") ;; +case $host_os in + linux*) + case $host_cpu in + *i[[3456789]]86*) AC_SUBST(EXTRA_BINARIES,"wine-preloader") ;; + x86_64*) AC_SUBST(EXTRA_BINARIES,"wine64-preloader") ;; esac ;; esac diff --git a/loader/Makefile.in b/loader/Makefile.in index 0ededde..ecaae76 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -9,9 +9,10 @@ EXTRA_BINARIES = @EXTRA_BINARIES@ PROGRAMS = \ wine \ - wine64 \ wine-installed \ - wine-preloader + wine-preloader \ + wine64 \ + wine64-preloader MANPAGE = wine.man @@ -32,8 +33,8 @@ all: $(MAIN_BINARY) wine-installed $(EXTRA_BINARIES) LIBPTHREAD = @LIBPTHREAD@ LDEXECFLAGS = @LDEXECFLAGS@ -wine-preloader: preloader.o Makefile.in - $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS) +wine-preloader wine64-preloader: preloader.o Makefile.in + $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o $(LIBPORT) $(LDFLAGS) $(MAIN_BINARY): main.o Makefile.in $(CC) -o $@ $(LDEXECFLAGS) main.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_LOCAL) diff --git a/loader/main.c b/loader/main.c index 628a0fa..9fe5e59 100644 --- a/loader/main.c +++ b/loader/main.c @@ -164,6 +164,13 @@ static int pre_exec(void) return 1; } +#elif defined(__linux__) && defined(__x86_64__) + +static int pre_exec(void) +{ + return 1; /* we have a preloader on x86-64 */ +} + #elif defined(__FreeBSD__) && defined(__i386__) static int pre_exec(void) diff --git a/loader/preloader.c b/loader/preloader.c index b14d94e..995cf59 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -108,10 +108,17 @@ static struct wine_preload_info preload_info[] = { +#ifdef __i386__ { (void *)0x00000000, 0x00010000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ +#else + { (void *)0x000000010000, 0x00100000 }, /* DOS area */ + { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ + { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ + { (void *)0x7ffffe000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ +#endif { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */ }; @@ -166,6 +173,8 @@ void *__stack_chk_guard = 0; void __stack_chk_fail_local(void) { return; } void __stack_chk_fail(void) { return; } +#ifdef __i386__ + /* data for setting up the glibc-style thread-local storage in %gs */ static int thread_data[256]; @@ -333,6 +342,126 @@ static inline int wld_prctl( int code, long arg ) return SYSCALL_RET(ret); } +#elif defined(__x86_64__) + +/* + * The _start function is the entry and exit point of this program + * + * It calls wld_start, passing a pointer to the args it receives + * then jumps to the address wld_start returns. + */ +void _start(void); +extern char _end[]; +__ASM_GLOBAL_FUNC(_start, + "movq %rsp,%rax\n\t" + "leaq -144(%rsp),%rsp\n\t" /* allocate some space for extra aux values */ + "movq %rsp,%rdi\n\t" /* ptr to orig stack pointer */ + "movq %rax,(%rdi)\n\t" /* orig stack pointer */ + "call wld_start\n\t" + "movq (%rsp),%rsp\n\t" /* new stack pointer */ + "pushq %rax\n\t" /* ELF interpreter entry point */ + "xorq %rax,%rax\n\t" + "xorq %rcx,%rcx\n\t" + "xorq %rdx,%rdx\n\t" + "xorq %rsi,%rsi\n\t" + "xorq %rdi,%rdi\n\t" + "xorq %r8,%r8\n\t" + "xorq %r9,%r9\n\t" + "xorq %r10,%r10\n\t" + "xorq %r11,%r11\n\t" + "ret") + +#define SYSCALL_RET(ret) (((ret) < 0 && (ret) > -4096) ? -1 : (ret)) + +static inline __attribute__((noreturn)) void wld_exit( int code ) +{ + for (;;) /* avoid warning */ + __asm__ __volatile__( "syscall" : : "a" (SYS_exit), "D" (code) ); +} + +static inline int wld_open( const char *name, int flags ) +{ + int ret; + __asm__ __volatile__( "syscall" : "=a" (ret) : "0" (SYS_open), "D" (name), "S" (flags) ); + return SYSCALL_RET(ret); +} + +static inline int wld_close( int fd ) +{ + int ret; + __asm__ __volatile__( "syscall" : "=a" (ret) : "0" (SYS_close), "D" (fd) ); + return SYSCALL_RET(ret); +} + +static inline ssize_t wld_read( int fd, void *buffer, size_t len ) +{ + int ret; + __asm__ __volatile__( "syscall" + : "=a" (ret) + : "0" (SYS_read), "D" (fd), "S" (buffer), "d" (len) + : "memory" ); + return SYSCALL_RET(ret); +} + +static inline ssize_t wld_write( int fd, const void *buffer, size_t len ) +{ + int ret; + __asm__ __volatile__( "syscall" : "=a" (ret) : "0" (SYS_write), "D" (fd), "S" (buffer), "d" (len) ); + return SYSCALL_RET(ret); +} + +static inline int wld_mprotect( const void *addr, size_t len, int prot ) +{ + int ret; + __asm__ __volatile__( "syscall" : "=a" (ret) : "0" (SYS_mprotect), "D" (addr), "S" (len), "d" (prot) ); + return SYSCALL_RET(ret); +} + +void *wld_mmap( void *start, size_t len, int prot, int flags, int fd, off_t offset ); +__ASM_GLOBAL_FUNC( wld_mmap, + "movq %rcx,%r10\n\t" + "movq $9,%rax\n\t" /* SYS_mmap */ + "syscall\n\t" + "ret" ); + +static inline uid_t wld_getuid(void) +{ + uid_t ret; + __asm__( "syscall" : "=a" (ret) : "0" (SYS_getuid) ); + return ret; +} + +static inline uid_t wld_geteuid(void) +{ + uid_t ret; + __asm__( "syscall" : "=a" (ret) : "0" (SYS_geteuid) ); + return ret; +} + +static inline gid_t wld_getgid(void) +{ + gid_t ret; + __asm__( "syscall" : "=a" (ret) : "0" (SYS_getgid) ); + return ret; +} + +static inline gid_t wld_getegid(void) +{ + gid_t ret; + __asm__( "syscall" : "=a" (ret) : "0" (SYS_getegid) ); + return ret; +} + +static inline int wld_prctl( int code, int arg ) +{ + int ret; + __asm__ __volatile__( "syscall" : "=a" (ret) : "D" (SYS_prctl), "S" (code), "d" (arg) ); + return SYSCALL_RET(ret); +} + +#else +#error preloader not implemented for this CPU +#endif /* replacement for libc functions */ @@ -594,8 +723,13 @@ static void map_so_lib( const char *name, struct wld_link_map *l) ( header->e_ident[3] != 'F' ) ) fatal_error( "%s: not an ELF binary... don't know how to load it\n", name ); +#ifdef __i386__ if( header->e_machine != EM_386 ) fatal_error("%s: not an i386 ELF binary... don't know how to load it\n", name ); +#elif defined(__x86_64__) + if( header->e_machine != EM_X86_64 ) + fatal_error("%s: not an x86-64 ELF binary... don't know how to load it\n", name ); +#endif if (header->e_phnum > sizeof(loadcmds)/sizeof(loadcmds[0])) fatal_error( "%s: oops... not enough space for load commands\n", name ); @@ -1082,8 +1216,14 @@ void* wld_start( void **stack ) if (reserve) preload_reserve( reserve ); for (i = 0; preload_info[i].size; i++) { - if (wld_mmap( preload_info[i].addr, preload_info[i].size, PROT_NONE, - MAP_FIXED | MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, -1, 0 ) == (void *)-1) + if ((char *)av >= (char *)preload_info[i].addr && + (char *)pargc <= (char *)preload_info[i].addr + preload_info[i].size) + { + remove_preload_range( i ); + i--; + } + else if (wld_mmap( preload_info[i].addr, preload_info[i].size, PROT_NONE, + MAP_FIXED | MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, -1, 0 ) == (void *)-1) { /* don't warn for low 64k */ if (preload_info[i].addr >= (void *)0x10000)

1 0

Michael Stefaniuc : shell32: Use an iface instead of a vtbl pointer in ShellItem.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 3f213cb798e73f9447bd4e0ea73ba12692977c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f213cb798e73f9447bd4e0ea… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:28 2010 +0100 shell32: Use an iface instead of a vtbl pointer in ShellItem. --- dlls/shell32/shellitem.c | 46 ++++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 805731f..d694503 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -39,23 +39,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct _ShellItem { - const IShellItemVtbl *lpIShellItemVtbl; + IShellItem IShellItem_iface; LONG ref; LPITEMIDLIST pidl; - const IPersistIDListVtbl *lpIPersistIDListVtbl; + IPersistIDList IPersistIDList_iface; } ShellItem; +static inline ShellItem *impl_from_IShellItem(IShellItem *iface) +{ + return CONTAINING_RECORD(iface, ShellItem, IShellItem_iface); +} + static inline ShellItem *impl_from_IPersistIDList( IPersistIDList *iface ) { - return (ShellItem*)((char*)iface - FIELD_OFFSET(ShellItem, lpIPersistIDListVtbl)); + return CONTAINING_RECORD(iface, ShellItem, IPersistIDList_iface); } static HRESULT WINAPI ShellItem_QueryInterface(IShellItem *iface, REFIID riid, void **ppv) { - ShellItem *This = (ShellItem*)iface; + ShellItem *This = impl_from_IShellItem(iface); TRACE("(%p,%p,%p)\n", iface, riid, ppv); @@ -67,7 +72,7 @@ static HRESULT WINAPI ShellItem_QueryInterface(IShellItem *iface, REFIID riid, } else if (IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistIDList, riid)) { - *ppv = &(This->lpIPersistIDListVtbl); + *ppv = &This->IPersistIDList_iface; } else { FIXME("not implemented for %s\n", shdebugstr_guid(riid)); @@ -81,7 +86,7 @@ static HRESULT WINAPI ShellItem_QueryInterface(IShellItem *iface, REFIID riid, static ULONG WINAPI ShellItem_AddRef(IShellItem *iface) { - ShellItem *This = (ShellItem*)iface; + ShellItem *This = impl_from_IShellItem(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p), new refcount=%i\n", iface, ref); @@ -91,7 +96,7 @@ static ULONG WINAPI ShellItem_AddRef(IShellItem *iface) static ULONG WINAPI ShellItem_Release(IShellItem *iface) { - ShellItem *This = (ShellItem*)iface; + ShellItem *This = impl_from_IShellItem(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p), new refcount=%i\n", iface, ref); @@ -174,7 +179,7 @@ static HRESULT ShellItem_get_shellfolder(ShellItem *This, IBindCtx *pbc, IShellF static HRESULT WINAPI ShellItem_BindToHandler(IShellItem *iface, IBindCtx *pbc, REFGUID rbhid, REFIID riid, void **ppvOut) { - ShellItem *This = (ShellItem*)iface; + ShellItem *This = impl_from_IShellItem(iface); HRESULT ret; TRACE("(%p,%p,%s,%p,%p)\n", iface, pbc, shdebugstr_guid(rbhid), riid, ppvOut); @@ -208,7 +213,8 @@ static HRESULT WINAPI ShellItem_BindToHandler(IShellItem *iface, IBindCtx *pbc, } else if (IsEqualGUID(rbhid, &BHID_DataObject)) { - return ShellItem_BindToHandler((IShellItem*)This, pbc, &BHID_SFUIObject, &IID_IDataObject, ppvOut); + return ShellItem_BindToHandler(&This->IShellItem_iface, pbc, &BHID_SFUIObject, + &IID_IDataObject, ppvOut); } FIXME("Unsupported BHID %s.\n", debugstr_guid(rbhid)); @@ -218,7 +224,7 @@ static HRESULT WINAPI ShellItem_BindToHandler(IShellItem *iface, IBindCtx *pbc, static HRESULT WINAPI ShellItem_GetParent(IShellItem *iface, IShellItem **ppsi) { - ShellItem *This = (ShellItem*)iface; + ShellItem *This = impl_from_IShellItem(iface); LPITEMIDLIST parent_pidl; HRESULT ret; @@ -237,7 +243,7 @@ static HRESULT WINAPI ShellItem_GetParent(IShellItem *iface, IShellItem **ppsi) static HRESULT WINAPI ShellItem_GetDisplayName(IShellItem *iface, SIGDN sigdnName, LPWSTR *ppszName) { - ShellItem *This = (ShellItem*)iface; + ShellItem *This = impl_from_IShellItem(iface); TRACE("(%p,%x,%p)\n", iface, sigdnName, ppszName); return SHGetNameFromIDList(This->pidl, sigdnName, ppszName); @@ -246,7 +252,7 @@ static HRESULT WINAPI ShellItem_GetDisplayName(IShellItem *iface, SIGDN sigdnNam static HRESULT WINAPI ShellItem_GetAttributes(IShellItem *iface, SFGAOF sfgaoMask, SFGAOF *psfgaoAttribs) { - ShellItem *This = (ShellItem*)iface; + ShellItem *This = impl_from_IShellItem(iface); IShellFolder *parent_folder; LPITEMIDLIST child_pidl; HRESULT ret; @@ -340,19 +346,19 @@ static HRESULT WINAPI ShellItem_IPersistIDList_QueryInterface(IPersistIDList *if REFIID riid, void **ppv) { ShellItem *This = impl_from_IPersistIDList(iface); - return ShellItem_QueryInterface((IShellItem*)This, riid, ppv); + return ShellItem_QueryInterface(&This->IShellItem_iface, riid, ppv); } static ULONG WINAPI ShellItem_IPersistIDList_AddRef(IPersistIDList *iface) { ShellItem *This = impl_from_IPersistIDList(iface); - return ShellItem_AddRef((IShellItem*)This); + return ShellItem_AddRef(&This->IShellItem_iface); } static ULONG WINAPI ShellItem_IPersistIDList_Release(IPersistIDList *iface) { ShellItem *This = impl_from_IPersistIDList(iface); - return ShellItem_Release((IShellItem*)This); + return ShellItem_Release(&This->IShellItem_iface); } static HRESULT WINAPI ShellItem_IPersistIDList_GetClassID(IPersistIDList* iface, @@ -419,13 +425,13 @@ HRESULT WINAPI IShellItem_Constructor(IUnknown *pUnkOuter, REFIID riid, void **p if (pUnkOuter) return CLASS_E_NOAGGREGATION; This = HeapAlloc(GetProcessHeap(), 0, sizeof(ShellItem)); - This->lpIShellItemVtbl = &ShellItem_Vtbl; + This->IShellItem_iface.lpVtbl = &ShellItem_Vtbl; This->ref = 1; This->pidl = NULL; - This->lpIPersistIDListVtbl = &ShellItem_IPersistIDList_Vtbl; + This->IPersistIDList_iface.lpVtbl = &ShellItem_IPersistIDList_Vtbl; - ret = ShellItem_QueryInterface((IShellItem*)This, riid, ppv); - ShellItem_Release((IShellItem*)This); + ret = ShellItem_QueryInterface(&This->IShellItem_iface, riid, ppv); + ShellItem_Release(&This->IShellItem_iface); return ret; } @@ -483,7 +489,7 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, ret = IShellItem_Constructor(NULL, &IID_IShellItem, (void**)&This); if (This) { - *ppsi = (IShellItem*)This; + *ppsi = &This->IShellItem_iface; This->pidl = new_pidl; } else

1 0

Michael Stefaniuc : windowscodecs: Use ifaces instead of vtbl pointers in PngEncoder.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 53af9f2b1ec93df8713eedc841637f26efdf7100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53af9f2b1ec93df8713eedc84… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:24 2010 +0100 windowscodecs: Use ifaces instead of vtbl pointers in PngEncoder. --- dlls/windowscodecs/pngformat.c | 53 ++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 9923097..f1c0e3c 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -803,8 +803,8 @@ static const struct png_pixelformat formats[] = { }; typedef struct PngEncoder { - const IWICBitmapEncoderVtbl *lpVtbl; - const IWICBitmapFrameEncodeVtbl *lpFrameVtbl; + IWICBitmapEncoder IWICBitmapEncoder_iface; + IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; LONG ref; IStream *stream; png_structp png_ptr; @@ -821,15 +821,20 @@ typedef struct PngEncoder { CRITICAL_SECTION lock; } PngEncoder; -static inline PngEncoder *encoder_from_frame(IWICBitmapFrameEncode *iface) +static inline PngEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) { - return CONTAINING_RECORD(iface, PngEncoder, lpFrameVtbl); + return CONTAINING_RECORD(iface, PngEncoder, IWICBitmapEncoder_iface); +} + +static inline PngEncoder *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) +{ + return CONTAINING_RECORD(iface, PngEncoder, IWICBitmapFrameEncode_iface); } static HRESULT WINAPI PngFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, void **ppv) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -837,7 +842,7 @@ static HRESULT WINAPI PngFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) { - *ppv = &This->lpFrameVtbl; + *ppv = &This->IWICBitmapFrameEncode_iface; } else { @@ -851,20 +856,20 @@ static HRESULT WINAPI PngFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface static ULONG WINAPI PngFrameEncode_AddRef(IWICBitmapFrameEncode *iface) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); return IUnknown_AddRef((IUnknown*)This); } static ULONG WINAPI PngFrameEncode_Release(IWICBitmapFrameEncode *iface) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); return IUnknown_Release((IUnknown*)This); } static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%p)\n", iface, pIEncoderOptions); EnterCriticalSection(&This->lock); @@ -885,7 +890,7 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_SetSize(IWICBitmapFrameEncode *iface, UINT uiWidth, UINT uiHeight) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); EnterCriticalSection(&This->lock); @@ -907,7 +912,7 @@ static HRESULT WINAPI PngFrameEncode_SetSize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, double dpiX, double dpiY) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); EnterCriticalSection(&This->lock); @@ -929,7 +934,7 @@ static HRESULT WINAPI PngFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, WICPixelFormatGUID *pPixelFormat) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); int i; TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); @@ -981,7 +986,7 @@ static HRESULT WINAPI PngFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); png_byte **row_pointers=NULL; UINT i; jmp_buf jmpbuf; @@ -1056,7 +1061,7 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, IWICBitmapSource *pIBitmapSource, WICRect *prc) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr; WICRect rc; WICPixelFormatGUID guid; @@ -1128,7 +1133,7 @@ static HRESULT WINAPI PngFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_Commit(IWICBitmapFrameEncode *iface) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); jmp_buf jmpbuf; TRACE("(%p)\n", iface); @@ -1184,7 +1189,7 @@ static const IWICBitmapFrameEncodeVtbl PngEncoder_FrameVtbl = { static HRESULT WINAPI PngEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, void **ppv) { - PngEncoder *This = (PngEncoder*)iface; + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -1206,7 +1211,7 @@ static HRESULT WINAPI PngEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID static ULONG WINAPI PngEncoder_AddRef(IWICBitmapEncoder *iface) { - PngEncoder *This = (PngEncoder*)iface; + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -1216,7 +1221,7 @@ static ULONG WINAPI PngEncoder_AddRef(IWICBitmapEncoder *iface) static ULONG WINAPI PngEncoder_Release(IWICBitmapEncoder *iface) { - PngEncoder *This = (PngEncoder*)iface; + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -1255,7 +1260,7 @@ static void user_flush(png_structp png_ptr) static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) { - PngEncoder *This = (PngEncoder*)iface; + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); jmp_buf jmpbuf; TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); @@ -1350,7 +1355,7 @@ static HRESULT WINAPI PngEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmap static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) { - PngEncoder *This = (PngEncoder*)iface; + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); @@ -1380,14 +1385,14 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, LeaveCriticalSection(&This->lock); IWICBitmapEncoder_AddRef(iface); - *ppIFrameEncode = (IWICBitmapFrameEncode*)&This->lpFrameVtbl; + *ppIFrameEncode = &This->IWICBitmapFrameEncode_iface; return S_OK; } static HRESULT WINAPI PngEncoder_Commit(IWICBitmapEncoder *iface) { - PngEncoder *This = (PngEncoder*)iface; + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); TRACE("(%p)\n", iface); EnterCriticalSection(&This->lock); @@ -1448,8 +1453,8 @@ HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This = HeapAlloc(GetProcessHeap(), 0, sizeof(PngEncoder)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &PngEncoder_Vtbl; - This->lpFrameVtbl = &PngEncoder_FrameVtbl; + This->IWICBitmapEncoder_iface.lpVtbl = &PngEncoder_Vtbl; + This->IWICBitmapFrameEncode_iface.lpVtbl = &PngEncoder_FrameVtbl; This->ref = 1; This->png_ptr = NULL; This->info_ptr = NULL;

1 0

Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in domdoctype.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 42bdbab6e3a95b188fb41a56bb2713f1059fc187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42bdbab6e3a95b188fb41a56b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:10 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in domdoctype. --- dlls/msxml3/doctype.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index 8538f3f..b695731 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -41,13 +41,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domdoctype { xmlnode node; - const struct IXMLDOMDocumentTypeVtbl *lpVtbl; + IXMLDOMDocumentType IXMLDOMDocumentType_iface; LONG ref; } domdoctype; static inline domdoctype *impl_from_IXMLDOMDocumentType( IXMLDOMDocumentType *iface ) { - return (domdoctype *)((char*)iface - FIELD_OFFSET(domdoctype, lpVtbl)); + return CONTAINING_RECORD(iface, domdoctype, IXMLDOMDocumentType_iface); } static HRESULT WINAPI domdoctype_QueryInterface( @@ -64,7 +64,7 @@ static HRESULT WINAPI domdoctype_QueryInterface( IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { - *ppvObject = &This->lpVtbl; + *ppvObject = &This->IXMLDOMDocumentType_iface; } else if(node_query_interface(&This->node, riid, ppvObject)) { @@ -176,8 +176,8 @@ static HRESULT WINAPI domdoctype_Invoke( hr = get_typeinfo(IXMLDOMDocumentType_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMDocumentType_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -615,12 +615,13 @@ IUnknown* create_doc_type( xmlNodePtr doctype ) if ( !This ) return NULL; - This->lpVtbl = &domdoctype_vtbl; + This->IXMLDOMDocumentType_iface.lpVtbl = &domdoctype_vtbl; This->ref = 1; - init_xmlnode(&This->node, doctype, (IXMLDOMNode*)&This->lpVtbl, &domdoctype_dispex); + init_xmlnode(&This->node, doctype, (IXMLDOMNode*)&This->IXMLDOMDocumentType_iface, + &domdoctype_dispex); - return (IUnknown*) &This->lpVtbl; + return (IUnknown*)&This->IXMLDOMDocumentType_iface; } #endif

1 0

Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in domfrag.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 1b11ffaa6b489d59ebc7677fc2b2fd20b69b7ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b11ffaa6b489d59ebc7677fc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:10 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in domfrag. --- dlls/msxml3/docfrag.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 2dcb894..5eb3a2c 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -40,13 +40,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domfrag { xmlnode node; - const struct IXMLDOMDocumentFragmentVtbl *lpVtbl; + IXMLDOMDocumentFragment IXMLDOMDocumentFragment_iface; LONG ref; } domfrag; static inline domfrag *impl_from_IXMLDOMDocumentFragment( IXMLDOMDocumentFragment *iface ) { - return (domfrag *)((char*)iface - FIELD_OFFSET(domfrag, lpVtbl)); + return CONTAINING_RECORD(iface, domfrag, IXMLDOMDocumentFragment_iface); } static HRESULT WINAPI domfrag_QueryInterface( @@ -170,8 +170,8 @@ static HRESULT WINAPI domfrag_Invoke( hr = get_typeinfo(IXMLDOMDocumentFragment_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMDocumentFragment_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -588,12 +588,12 @@ IUnknown* create_doc_fragment( xmlNodePtr fragment ) if ( !This ) return NULL; - This->lpVtbl = &domfrag_vtbl; + This->IXMLDOMDocumentFragment_iface.lpVtbl = &domfrag_vtbl; This->ref = 1; - init_xmlnode(&This->node, fragment, (IXMLDOMNode*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, fragment, (IXMLDOMNode*)&This->IXMLDOMDocumentFragment_iface, NULL); - return (IUnknown*) &This->lpVtbl; + return (IUnknown*)&This->IXMLDOMDocumentFragment_iface; } #endif

1 0

Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in domcomment.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 45f1825e7209e74e711c80d8216de30ab1fa5ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f1825e7209e74e711c80d82… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:07 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in domcomment. --- dlls/msxml3/comment.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 6ea3e71..8513ef0 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -40,13 +40,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domcomment { xmlnode node; - const struct IXMLDOMCommentVtbl *lpVtbl; + IXMLDOMComment IXMLDOMComment_iface; LONG ref; } domcomment; static inline domcomment *impl_from_IXMLDOMComment( IXMLDOMComment *iface ) { - return (domcomment *)((char*)iface - FIELD_OFFSET(domcomment, lpVtbl)); + return CONTAINING_RECORD(iface, domcomment, IXMLDOMComment_iface); } static HRESULT WINAPI domcomment_QueryInterface( @@ -171,8 +171,8 @@ static HRESULT WINAPI domcomment_Invoke( hr = get_typeinfo(IXMLDOMComment_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMComment_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -837,12 +837,12 @@ IUnknown* create_comment( xmlNodePtr comment ) if ( !This ) return NULL; - This->lpVtbl = &domcomment_vtbl; + This->IXMLDOMComment_iface.lpVtbl = &domcomment_vtbl; This->ref = 1; - init_xmlnode(&This->node, comment, (IXMLDOMNode*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, comment, (IXMLDOMNode*)&This->IXMLDOMComment_iface, NULL); - return (IUnknown*) &This->lpVtbl; + return (IUnknown*)&This->IXMLDOMComment_iface; } #endif

1 0

Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in domimpl.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 0be2929b031eb9f32cb0d3c66c3b67bf969d602d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be2929b031eb9f32cb0d3c66… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:11 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in domimpl. --- dlls/msxml3/domimpl.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 32a27bb..5cc6bff 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -39,13 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domimpl { - const struct IXMLDOMImplementationVtbl *lpVtbl; + IXMLDOMImplementation IXMLDOMImplementation_iface; LONG ref; } domimpl; static inline domimpl *impl_from_IXMLDOMImplementation( IXMLDOMImplementation *iface ) { - return (domimpl *)((char*)iface - FIELD_OFFSET(domimpl, lpVtbl)); + return CONTAINING_RECORD(iface, domimpl, IXMLDOMImplementation_iface); } static HRESULT WINAPI dimimpl_QueryInterface( @@ -164,8 +164,8 @@ static HRESULT WINAPI dimimpl_Invoke( hr = get_typeinfo(IXMLDOMImplementation_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMImplementation_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -220,10 +220,10 @@ IUnknown* create_doc_Implementation(void) if ( !This ) return NULL; - This->lpVtbl = &dimimpl_vtbl; + This->IXMLDOMImplementation_iface.lpVtbl = &dimimpl_vtbl; This->ref = 1; - return (IUnknown*) &This->lpVtbl; + return (IUnknown*)&This->IXMLDOMImplementation_iface; } #endif

1 0

Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in dom_pi.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 92a93a5c26a4de763e94d341304ac3c57e7bdf65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a93a5c26a4de763e94d3413… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:18 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in dom_pi. --- dlls/msxml3/pi.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 9ada032..9c3857d 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -40,13 +40,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _dom_pi { xmlnode node; - const struct IXMLDOMProcessingInstructionVtbl *lpVtbl; + IXMLDOMProcessingInstruction IXMLDOMProcessingInstruction_iface; LONG ref; } dom_pi; static inline dom_pi *impl_from_IXMLDOMProcessingInstruction( IXMLDOMProcessingInstruction *iface ) { - return (dom_pi *)((char*)iface - FIELD_OFFSET(dom_pi, lpVtbl)); + return CONTAINING_RECORD(iface, dom_pi, IXMLDOMProcessingInstruction_iface); } static HRESULT WINAPI dom_pi_QueryInterface( @@ -170,8 +170,8 @@ static HRESULT WINAPI dom_pi_Invoke( hr = get_typeinfo(IXMLDOMProcessingInstruction_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMProcessingInstruction_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -313,7 +313,7 @@ static HRESULT WINAPI dom_pi_get_attributes( TRACE("(%p)->(%p)\n", This, attributeMap); - *attributeMap = create_nodemap((IXMLDOMNode*)&This->lpVtbl); + *attributeMap = create_nodemap((IXMLDOMNode*)&This->IXMLDOMProcessingInstruction_iface); return S_OK; } @@ -668,12 +668,12 @@ IUnknown* create_pi( xmlNodePtr pi ) if ( !This ) return NULL; - This->lpVtbl = &dom_pi_vtbl; + This->IXMLDOMProcessingInstruction_iface.lpVtbl = &dom_pi_vtbl; This->ref = 1; - init_xmlnode(&This->node, pi, (IXMLDOMNode*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, pi, (IXMLDOMNode*)&This->IXMLDOMProcessingInstruction_iface, NULL); - return (IUnknown*) &This->lpVtbl; + return (IUnknown*)&This->IXMLDOMProcessingInstruction_iface; } #endif

1 0

Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in domtext.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 73b08ed2f05bf510ed649f0e188f96d47b190914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73b08ed2f05bf510ed649f0e1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:19 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in domtext. --- dlls/msxml3/text.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 76d81c2..4a2bd21 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -41,13 +41,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domtext { xmlnode node; - const struct IXMLDOMTextVtbl *lpVtbl; + IXMLDOMText IXMLDOMText_iface; LONG ref; } domtext; static inline domtext *impl_from_IXMLDOMText( IXMLDOMText *iface ) { - return (domtext *)((char*)iface - FIELD_OFFSET(domtext, lpVtbl)); + return CONTAINING_RECORD(iface, domtext, IXMLDOMText_iface); } static HRESULT WINAPI domtext_QueryInterface( @@ -179,7 +179,7 @@ static HRESULT WINAPI domtext_Invoke( hr = get_typeinfo(IXMLDOMText_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMText_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -945,12 +945,12 @@ IUnknown* create_text( xmlNodePtr text ) if ( !This ) return NULL; - This->lpVtbl = &domtext_vtbl; + This->IXMLDOMText_iface.lpVtbl = &domtext_vtbl; This->ref = 1; - init_xmlnode(&This->node, text, (IXMLDOMNode*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, text, (IXMLDOMNode*)&This->IXMLDOMText_iface, NULL); - return (IUnknown*) &This->lpVtbl; + return (IUnknown*)&This->IXMLDOMText_iface; } #endif

1 0

Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in domelem.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 25df7aac27b8d3618f688826a64f15ff5d8ae2bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=25df7aac27b8d3618f688826a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:12 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in domelem. --- dlls/msxml3/element.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index adb2bb3..f76bf60 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -44,13 +44,13 @@ static const xmlChar DT_nsURI[] = "urn:schemas-microsoft-com:datatypes"; typedef struct _domelem { xmlnode node; - const struct IXMLDOMElementVtbl *lpVtbl; + IXMLDOMElement IXMLDOMElement_iface; LONG ref; } domelem; static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface ) { - return (domelem *)((char*)iface - FIELD_OFFSET(domelem, lpVtbl)); + return CONTAINING_RECORD(iface, domelem, IXMLDOMElement_iface); } static inline xmlNodePtr get_element( const domelem *This ) @@ -72,7 +72,7 @@ static HRESULT WINAPI domelem_QueryInterface( IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { - *ppvObject = &This->lpVtbl; + *ppvObject = &This->IXMLDOMElement_iface; } else if(node_query_interface(&This->node, riid, ppvObject)) { @@ -184,8 +184,8 @@ static HRESULT WINAPI domelem_Invoke( hr = get_typeinfo(IXMLDOMElement_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMElement_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -314,7 +314,7 @@ static HRESULT WINAPI domelem_get_attributes( TRACE("(%p)->(%p)\n", This, attributeMap); - *attributeMap = create_nodemap((IXMLDOMNode*)&This->lpVtbl); + *attributeMap = create_nodemap((IXMLDOMNode*)&This->IXMLDOMElement_iface); return S_OK; } @@ -1333,12 +1333,12 @@ IUnknown* create_element( xmlNodePtr element ) if ( !This ) return NULL; - This->lpVtbl = &domelem_vtbl; + This->IXMLDOMElement_iface.lpVtbl = &domelem_vtbl; This->ref = 1; - init_xmlnode(&This->node, element, (IXMLDOMNode*)&This->lpVtbl, &domelem_dispex); + init_xmlnode(&This->node, element, (IXMLDOMNode*)&This->IXMLDOMElement_iface, &domelem_dispex); - return (IUnknown*) &This->lpVtbl; + return (IUnknown*)&This->IXMLDOMElement_iface; } #endif

1 0