December 2010 - Wine-commits

Alexandre Julliard : loader: Make sure the new stack is 16-byte aligned in the preloader.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 144cb78dbaeedcc36946907c5ccf391ecb011f04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=144cb78dbaeedcc36946907c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 16:52:02 2010 +0100 loader: Make sure the new stack is 16-byte aligned in the preloader. --- loader/preloader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 2dc2872..8524ba5 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -512,18 +512,19 @@ static void set_auxiliary_values( ElfW(auxv_t) *av, const ElfW(auxv_t) *new_av, src = (char *)*stack; dst = src - (new_count - delete_count) * sizeof(*av); - if (new_count > delete_count) /* need to make room for the extra values */ + dst = (char *)((unsigned long)dst & ~15); + if (dst < src) /* need to make room for the extra values */ { int len = (char *)(av + av_count + 1) - src; for (i = 0; i < len; i++) dst[i] = src[i]; } - else if (new_count < delete_count) /* get rid of unused values */ + else if (dst > src) /* get rid of unused values */ { int len = (char *)(av + av_count + 1) - src; for (i = len - 1; i >= 0; i--) dst[i] = src[i]; } *stack = dst; - av -= (new_count - delete_count); + av = (ElfW(auxv_t) *)((char *)av + (dst - src)); /* now set the values */ for (j = 0; new_av[j].a_type != AT_NULL; j++)

1 0

Alexandre Julliard : loader: Use long instead of int in the preloader for anything that can store a pointer .
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: fe031c937d711603c711e76c2bdf5c743af98d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe031c937d711603c711e76c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 16:53:24 2010 +0100 loader: Use long instead of int in the preloader for anything that can store a pointer. --- loader/preloader.c | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 8524ba5..b14d94e 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -137,7 +137,7 @@ static struct wine_preload_info preload_info[] = #define DT_GNU_HASH 0x6ffffef5 #endif -static unsigned int page_size, page_mask; +static size_t page_size, page_mask; static char *preloader_start, *preloader_end; struct wld_link_map { @@ -325,7 +325,7 @@ static inline gid_t wld_getegid(void) return ret; } -static inline int wld_prctl( int code, int arg ) +static inline int wld_prctl( int code, long arg ) { int ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" @@ -378,20 +378,20 @@ static int wld_vsprintf(char *buffer, const char *fmt, va_list args ) if( *p == 'x' ) { unsigned int x = va_arg( args, unsigned int ); - for(i=7; i>=0; i--) + for (i = 2*sizeof(x) - 1; i >= 0; i--) *str++ = hex_chars[(x>>(i*4))&0xf]; } else if (p[0] == 'l' && p[1] == 'x') { unsigned long x = va_arg( args, unsigned long ); - for(i=7; i>=0; i--) + for (i = 2*sizeof(x) - 1; i >= 0; i--) *str++ = hex_chars[(x>>(i*4))&0xf]; p++; } else if( *p == 'p' ) { unsigned long x = (unsigned long)va_arg( args, void * ); - for(i=7; i>=0; i--) + for (i = 2*sizeof(x) - 1; i >= 0; i--) *str++ = hex_chars[(x>>(i*4))&0xf]; } else if( *p == 's' ) @@ -470,8 +470,8 @@ static void dump_auxiliary( ElfW(auxv_t) *av ) for ( ; av->a_type != AT_NULL; av++) { for (i = 0; names[i].name; i++) if (names[i].val == av->a_type) break; - if (names[i].name) wld_printf("%s = %lx\n", names[i].name, av->a_un.a_val); - else wld_printf( "%x = %lx\n", av->a_type, av->a_un.a_val ); + if (names[i].name) wld_printf("%s = %lx\n", names[i].name, (unsigned long)av->a_un.a_val); + else wld_printf( "%lx = %lx\n", (unsigned long)av->a_type, (unsigned long)av->a_un.a_val ); } } #endif @@ -616,14 +616,14 @@ static void map_so_lib( const char *name, struct wld_link_map *l) #ifdef DUMP_SEGMENTS wld_printf( "ph = %p\n", ph ); - wld_printf( " p_type = %x\n", ph->p_type ); - wld_printf( " p_flags = %x\n", ph->p_flags ); - wld_printf( " p_offset = %x\n", ph->p_offset ); - wld_printf( " p_vaddr = %x\n", ph->p_vaddr ); - wld_printf( " p_paddr = %x\n", ph->p_paddr ); - wld_printf( " p_filesz = %x\n", ph->p_filesz ); - wld_printf( " p_memsz = %x\n", ph->p_memsz ); - wld_printf( " p_align = %x\n", ph->p_align ); + wld_printf( " p_type = %lx\n", (unsigned long)ph->p_type ); + wld_printf( " p_flags = %lx\n", (unsigned long)ph->p_flags ); + wld_printf( " p_offset = %lx\n", (unsigned long)ph->p_offset ); + wld_printf( " p_vaddr = %lx\n", (unsigned long)ph->p_vaddr ); + wld_printf( " p_paddr = %lx\n", (unsigned long)ph->p_paddr ); + wld_printf( " p_filesz = %lx\n", (unsigned long)ph->p_filesz ); + wld_printf( " p_memsz = %lx\n", (unsigned long)ph->p_memsz ); + wld_printf( " p_align = %lx\n", (unsigned long)ph->p_align ); #endif switch (ph->p_type) @@ -738,7 +738,7 @@ static void map_so_lib( const char *name, struct wld_link_map *l) && ((size_t) (c->mapend - c->mapstart + c->mapoff) >= header->e_phoff + header->e_phnum * sizeof (ElfW(Phdr)))) /* Found the program header in this segment. */ - l->l_phdr = (void *)(unsigned int) (c->mapstart + header->e_phoff - c->mapoff); + l->l_phdr = (void *)(unsigned long)(c->mapstart + header->e_phoff - c->mapoff); if (c->allocend > c->dataend) { @@ -846,7 +846,7 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int if( PT_DYNAMIC == ph->p_type ) { dyn = (void *) ph->p_vaddr; - num = ph->p_memsz / sizeof (Elf32_Dyn); + num = ph->p_memsz / sizeof (*dyn); break; } } @@ -863,7 +863,7 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int if( dyn->d_tag == DT_GNU_HASH ) gnu_hashtab = (const Elf32_Word *)dyn->d_un.d_ptr; #ifdef DUMP_SYMS - wld_printf("%x %x\n", dyn->d_tag, dyn->d_un.d_ptr ); + wld_printf("%lx %p\n", (unsigned long)dyn->d_tag, (void *)dyn->d_un.d_ptr ); #endif dyn++; } @@ -907,7 +907,7 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int found: #ifdef DUMP_SYMS - wld_printf("Found %s -> %x\n", strings + symtab[idx].st_name, symtab[idx].st_value ); + wld_printf("Found %s -> %p\n", strings + symtab[idx].st_name, (void *)symtab[idx].st_value ); #endif return (void *)symtab[idx].st_value; } @@ -1022,7 +1022,7 @@ static void set_process_name( int argc, char *argv[] ) /* set the process short name */ for (p = name = argv[1]; *p; p++) if (p[0] == '/' && p[1]) name = p + 1; - if (wld_prctl( 15 /* PR_SET_NAME */, (int)name ) == -1) return; + if (wld_prctl( 15 /* PR_SET_NAME */, (long)name ) == -1) return; /* find the end of the argv array and move everything down */ end = argv[argc - 1]; @@ -1043,7 +1043,7 @@ static void set_process_name( int argc, char *argv[] ) */ void* wld_start( void **stack ) { - int i, *pargc; + long i, *pargc; char **argv, **p; char *interp, *reserve = NULL; ElfW(auxv_t) new_av[12], delete_av[3], *av; @@ -1069,12 +1069,12 @@ void* wld_start( void **stack ) page_size = get_auxiliary( av, AT_PAGESZ, 4096 ); page_mask = page_size - 1; - preloader_start = (char *)_start - ((unsigned int)_start & page_mask); - preloader_end = (char *)((unsigned int)(_end + page_mask) & ~page_mask); + preloader_start = (char *)_start - ((unsigned long)_start & page_mask); + preloader_end = (char *)((unsigned long)(_end + page_mask) & ~page_mask); #ifdef DUMP_AUX_INFO wld_printf( "stack = %p\n", *stack ); - for( i = 0; i < *pargc; i++ ) wld_printf("argv[%x] = %s\n", i, argv[i]); + for( i = 0; i < *pargc; i++ ) wld_printf("argv[%lx] = %s\n", i, argv[i]); dump_auxiliary( av ); #endif @@ -1145,7 +1145,7 @@ void* wld_start( void **stack ) #ifdef DUMP_AUX_INFO wld_printf("new stack = %p\n", *stack); - wld_printf("jumping to %x\n", ld_so_map.l_entry); + wld_printf("jumping to %p\n", (void *)ld_so_map.l_entry); #endif return (void *)ld_so_map.l_entry;

1 0

Alexandre Julliard : loader: Build the preloader for x86-64.
by Alexandre Julliard 17 Dec '10

17 Dec '10

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 : msxml3: Use an iface instead of a vtbl pointer in domcomment.
by Alexandre Julliard 17 Dec '10

17 Dec '10

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 17 Dec '10

17 Dec '10

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 domdoctype.
by Alexandre Julliard 17 Dec '10

17 Dec '10

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 17 Dec '10

17 Dec '10

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 domcdata.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 6a319a33280563db7052e60be37aa54f377cc55c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a319a33280563db7052e60be… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:06 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in domcdata. --- dlls/msxml3/cdata.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index e4f24c5..227563f 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -40,13 +40,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domcdata { xmlnode node; - const struct IXMLDOMCDATASectionVtbl *lpVtbl; + IXMLDOMCDATASection IXMLDOMCDATASection_iface; LONG ref; } domcdata; static inline domcdata *impl_from_IXMLDOMCDATASection( IXMLDOMCDATASection *iface ) { - return (domcdata *)((char*)iface - FIELD_OFFSET(domcdata, lpVtbl)); + return CONTAINING_RECORD(iface, domcdata, IXMLDOMCDATASection_iface); } static HRESULT WINAPI domcdata_QueryInterface( @@ -177,8 +177,8 @@ static HRESULT WINAPI domcdata_Invoke( hr = get_typeinfo(IXMLDOMCDATASection_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMCDATASection_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -892,12 +892,12 @@ IUnknown* create_cdata( xmlNodePtr text ) if ( !This ) return NULL; - This->lpVtbl = &domcdata_vtbl; + This->IXMLDOMCDATASection_iface.lpVtbl = &domcdata_vtbl; This->ref = 1; - init_xmlnode(&This->node, text, (IXMLDOMNode*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, text, (IXMLDOMNode*)&This->IXMLDOMCDATASection_iface, NULL); - return (IUnknown*) &This->lpVtbl; + return (IUnknown*)&This->IXMLDOMCDATASection_iface; } #endif

1 0

Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in entityref.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: ba7c7547260485f36ebcf2b90d665651287fafdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba7c7547260485f36ebcf2b90… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:14 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in entityref. --- dlls/msxml3/entityref.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 698f1e5..032c779 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -40,13 +40,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _entityref { xmlnode node; - const struct IXMLDOMEntityReferenceVtbl *lpVtbl; + IXMLDOMEntityReference IXMLDOMEntityReference_iface; LONG ref; } entityref; static inline entityref *impl_from_IXMLDOMEntityReference( IXMLDOMEntityReference *iface ) { - return (entityref *)((char*)iface - FIELD_OFFSET(entityref, lpVtbl)); + return CONTAINING_RECORD(iface, entityref, IXMLDOMEntityReference_iface); } static HRESULT WINAPI entityref_QueryInterface( @@ -169,8 +169,8 @@ static HRESULT WINAPI entityref_Invoke( hr = get_typeinfo(IXMLDOMEntityReference_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMEntityReference_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -582,12 +582,12 @@ IUnknown* create_doc_entity_ref( xmlNodePtr entity ) if ( !This ) return NULL; - This->lpVtbl = &entityref_vtbl; + This->IXMLDOMEntityReference_iface.lpVtbl = &entityref_vtbl; This->ref = 1; - init_xmlnode(&This->node, entity, (IXMLDOMNode*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, entity, (IXMLDOMNode*)&This->IXMLDOMEntityReference_iface, NULL); - return (IUnknown*) &This->lpVtbl; + return (IUnknown*)&This->IXMLDOMEntityReference_iface; } #endif

1 0

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

17 Dec '10

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