wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Huw Davies : gdi32: Clear the accel flags.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: aec376dcef20823b81d6c70926e02d5c27c40b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec376dcef20823b81d6c7092… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 7 11:37:14 2010 +0000 gdi32: Clear the accel flags. --- dlls/gdi32/freetype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e2db1aa..81c8e46 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6230,6 +6230,7 @@ DWORD WineEngGetFontUnicodeRanges(GdiFont *font, LPGLYPHSET glyphset) { glyphset->cbThis = size; glyphset->cRanges = num_ranges; + glyphset->flAccel = 0; } return size; }

1 0

Huw Davies : include: Add GLYPHSET flag define.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 78687532e4cc01e30946a22688e5e5c384b5bfa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78687532e4cc01e30946a2268… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 16 13:56:08 2010 +0000 include: Add GLYPHSET flag define. --- include/wingdi.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index e10bbe9..12e28dc 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3331,6 +3331,8 @@ typedef struct tagGLYPHSET { WCRANGE ranges[1]; } GLYPHSET, *PGLYPHSET, *LPGLYPHSET; +#define GS_8BIT_INDICES 0x00000001 + WINGDIAPI INT WINAPI AbortDoc(HDC); WINGDIAPI BOOL WINAPI AbortPath(HDC); WINGDIAPI INT WINAPI AddFontResourceA(LPCSTR);

1 0

Huw Davies : ole32: Rewrite the OleAdviseHolder' s STATDATA enumerator to be a generic STATDATA enumerator.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 10aa9b219472e2662721146bc19cb74e08173d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10aa9b219472e2662721146bc… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 16 12:20:51 2010 +0000 ole32: Rewrite the OleAdviseHolder's STATDATA enumerator to be a generic STATDATA enumerator. --- dlls/ole32/oleobj.c | 201 ++++++++++++++++++++++++++++++++------------------- 1 files changed, 128 insertions(+), 73 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 4b2b5d7..6b4106a 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -38,6 +38,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #define INITIAL_SINKS 10 +static void release_statdata(STATDATA *data) +{ + if(data->formatetc.ptd) + { + CoTaskMemFree(data->formatetc.ptd); + data->formatetc.ptd = NULL; + } + + if(data->pAdvSink) + { + IAdviseSink_Release(data->pAdvSink); + data->pAdvSink = NULL; + } +} + +static HRESULT copy_statdata(STATDATA *dst, const STATDATA *src) +{ + *dst = *src; + if(src->formatetc.ptd) + { + dst->formatetc.ptd = CoTaskMemAlloc(src->formatetc.ptd->tdSize); + if(!dst->formatetc.ptd) return E_OUTOFMEMORY; + memcpy(dst->formatetc.ptd, src->formatetc.ptd, src->formatetc.ptd->tdSize); + } + if(dst->pAdvSink) IAdviseSink_AddRef(dst->pAdvSink); + return S_OK; +} + /************************************************************************** * OleAdviseHolderImpl Implementation */ @@ -52,7 +80,7 @@ typedef struct OleAdviseHolderImpl } OleAdviseHolderImpl; -static HRESULT EnumOleSTATDATA_Construct(OleAdviseHolderImpl *pOleAdviseHolder, ULONG index, IEnumSTATDATA **ppenum); +static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD num, STATDATA *data, IEnumSTATDATA **ppenum); typedef struct { @@ -60,16 +88,17 @@ typedef struct LONG ref; ULONG index; - OleAdviseHolderImpl *pOleAdviseHolder; -} EnumOleSTATDATA; + DWORD num_of_elems; + STATDATA *statdata; + IUnknown *holder; +} EnumSTATDATA; -static inline EnumOleSTATDATA *impl_from_IEnumSTATDATA(IEnumSTATDATA *iface) +static inline EnumSTATDATA *impl_from_IEnumSTATDATA(IEnumSTATDATA *iface) { - return CONTAINING_RECORD(iface, EnumOleSTATDATA, IEnumSTATDATA_iface); + return CONTAINING_RECORD(iface, EnumSTATDATA, IEnumSTATDATA_iface); } -static HRESULT WINAPI EnumOleSTATDATA_QueryInterface( - IEnumSTATDATA *iface, REFIID riid, void **ppv) +static HRESULT WINAPI EnumSTATDATA_QueryInterface(IEnumSTATDATA *iface, REFIID riid, void **ppv) { TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); if (IsEqualIID(riid, &IID_IUnknown) || @@ -82,91 +111,77 @@ static HRESULT WINAPI EnumOleSTATDATA_QueryInterface( return E_NOINTERFACE; } -static ULONG WINAPI EnumOleSTATDATA_AddRef( - IEnumSTATDATA *iface) +static ULONG WINAPI EnumSTATDATA_AddRef(IEnumSTATDATA *iface) { - EnumOleSTATDATA *This = impl_from_IEnumSTATDATA(iface); + EnumSTATDATA *This = impl_from_IEnumSTATDATA(iface); TRACE("()\n"); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI EnumOleSTATDATA_Release( - IEnumSTATDATA *iface) +static ULONG WINAPI EnumSTATDATA_Release(IEnumSTATDATA *iface) { - EnumOleSTATDATA *This = impl_from_IEnumSTATDATA(iface); + EnumSTATDATA *This = impl_from_IEnumSTATDATA(iface); LONG refs = InterlockedDecrement(&This->ref); TRACE("()\n"); if (!refs) { - IOleAdviseHolder_Release((IOleAdviseHolder *)This->pOleAdviseHolder); + DWORD i; + for(i = 0; i < This->num_of_elems; i++) + release_statdata(This->statdata + i); + HeapFree(GetProcessHeap(), 0, This->statdata); + IUnknown_Release(This->holder); HeapFree(GetProcessHeap(), 0, This); } return refs; } -static HRESULT WINAPI EnumOleSTATDATA_Next( - IEnumSTATDATA *iface, ULONG celt, LPSTATDATA rgelt, - ULONG *pceltFetched) +static HRESULT WINAPI EnumSTATDATA_Next(IEnumSTATDATA *iface, ULONG num, LPSTATDATA data, + ULONG *fetched) { - EnumOleSTATDATA *This = impl_from_IEnumSTATDATA(iface); + EnumSTATDATA *This = impl_from_IEnumSTATDATA(iface); + DWORD count = 0; HRESULT hr = S_OK; - TRACE("(%d, %p, %p)\n", celt, rgelt, pceltFetched); + TRACE("(%d, %p, %p)\n", num, data, fetched); - if (pceltFetched) - *pceltFetched = 0; - - for (; celt; celt--, rgelt++) + while(num--) { - while ((This->index < This->pOleAdviseHolder->maxSinks) && - !This->pOleAdviseHolder->arrayOfSinks[This->index]) - { - This->index++; - } - if (This->index >= This->pOleAdviseHolder->maxSinks) + if (This->index >= This->num_of_elems) { hr = S_FALSE; break; } - memset(&rgelt->formatetc, 0, sizeof(rgelt->formatetc)); - rgelt->advf = 0; - rgelt->pAdvSink = This->pOleAdviseHolder->arrayOfSinks[This->index]; - IAdviseSink_AddRef(rgelt->pAdvSink); - rgelt->dwConnection = This->index; + copy_statdata(data + count, This->statdata + This->index); - if (pceltFetched) - (*pceltFetched)++; + count++; This->index++; } + + if (fetched) *fetched = count; + return hr; } -static HRESULT WINAPI EnumOleSTATDATA_Skip( - IEnumSTATDATA *iface, ULONG celt) +static HRESULT WINAPI EnumSTATDATA_Skip(IEnumSTATDATA *iface, ULONG num) { - EnumOleSTATDATA *This = impl_from_IEnumSTATDATA(iface); + EnumSTATDATA *This = impl_from_IEnumSTATDATA(iface); - TRACE("(%d)\n", celt); + TRACE("(%d)\n", num); - for (; celt; celt--) + if(This->index + num >= This->num_of_elems) { - while ((This->index < This->pOleAdviseHolder->maxSinks) && - !This->pOleAdviseHolder->arrayOfSinks[This->index]) - { - This->index++; - } - if (This->index >= This->pOleAdviseHolder->maxSinks) - return S_FALSE; - This->index++; + This->index = This->num_of_elems; + return S_FALSE; } + + This->index += num; return S_OK; } -static HRESULT WINAPI EnumOleSTATDATA_Reset( - IEnumSTATDATA *iface) +static HRESULT WINAPI EnumSTATDATA_Reset(IEnumSTATDATA *iface) { - EnumOleSTATDATA *This = impl_from_IEnumSTATDATA(iface); + EnumSTATDATA *This = impl_from_IEnumSTATDATA(iface); TRACE("()\n"); @@ -174,35 +189,49 @@ static HRESULT WINAPI EnumOleSTATDATA_Reset( return S_OK; } -static HRESULT WINAPI EnumOleSTATDATA_Clone( - IEnumSTATDATA *iface, - IEnumSTATDATA **ppenum) +static HRESULT WINAPI EnumSTATDATA_Clone(IEnumSTATDATA *iface, IEnumSTATDATA **ppenum) { - EnumOleSTATDATA *This = impl_from_IEnumSTATDATA(iface); - return EnumOleSTATDATA_Construct(This->pOleAdviseHolder, This->index, ppenum); + EnumSTATDATA *This = impl_from_IEnumSTATDATA(iface); + + return EnumSTATDATA_Construct(This->holder, This->index, This->num_of_elems, This->statdata, ppenum); } -static const IEnumSTATDATAVtbl EnumOleSTATDATA_VTable = +static const IEnumSTATDATAVtbl EnumSTATDATA_VTable = { - EnumOleSTATDATA_QueryInterface, - EnumOleSTATDATA_AddRef, - EnumOleSTATDATA_Release, - EnumOleSTATDATA_Next, - EnumOleSTATDATA_Skip, - EnumOleSTATDATA_Reset, - EnumOleSTATDATA_Clone + EnumSTATDATA_QueryInterface, + EnumSTATDATA_AddRef, + EnumSTATDATA_Release, + EnumSTATDATA_Next, + EnumSTATDATA_Skip, + EnumSTATDATA_Reset, + EnumSTATDATA_Clone }; -static HRESULT EnumOleSTATDATA_Construct(OleAdviseHolderImpl *pOleAdviseHolder, ULONG index, IEnumSTATDATA **ppenum) +static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD num, STATDATA *data, + IEnumSTATDATA **ppenum) { - EnumOleSTATDATA *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - if (!This) - return E_OUTOFMEMORY; - This->IEnumSTATDATA_iface.lpVtbl = &EnumOleSTATDATA_VTable; + EnumSTATDATA *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + DWORD i; + + if (!This) return E_OUTOFMEMORY; + + This->IEnumSTATDATA_iface.lpVtbl = &EnumSTATDATA_VTable; This->ref = 1; This->index = index; - This->pOleAdviseHolder = pOleAdviseHolder; - IOleAdviseHolder_AddRef((IOleAdviseHolder *)pOleAdviseHolder); + + This->statdata = HeapAlloc(GetProcessHeap(), 0, num * sizeof(*This->statdata)); + if(!This->statdata) + { + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } + + for(i = 0; i < num; i++) + copy_statdata(This->statdata + i, data + i); + + This->num_of_elems = num; + This->holder = holder; + IUnknown_AddRef(holder); *ppenum = &This->IEnumSTATDATA_iface; return S_OK; } @@ -415,12 +444,38 @@ static HRESULT WINAPI OleAdviseHolderImpl_EnumAdvise (LPOLEADVISEHOLDER iface, IEnumSTATDATA **ppenumAdvise) { OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; + IUnknown *unk; + DWORD i, count; + STATDATA *data; + static const FORMATETC empty_fmtetc = {0, NULL, 0, -1, 0}; + HRESULT hr; TRACE("(%p)->(%p)\n", This, ppenumAdvise); *ppenumAdvise = NULL; - return EnumOleSTATDATA_Construct(This, 0, ppenumAdvise); + /* Build an array of STATDATA structures */ + data = HeapAlloc(GetProcessHeap(), 0, This->maxSinks * sizeof(*data)); + if(!data) return E_OUTOFMEMORY; + + for(i = 0, count = 0; i < This->maxSinks; i++) + { + if(This->arrayOfSinks[i]) + { + data[count].formatetc = empty_fmtetc; + data[count].advf = 0; + data[count].pAdvSink = This->arrayOfSinks[i]; /* The constructor will take a ref. */ + data[count].dwConnection = i; + count++; + } + } + + IOleAdviseHolder_QueryInterface(iface, &IID_IUnknown, (void**)&unk); + hr = EnumSTATDATA_Construct(unk, 0, count, data, ppenumAdvise); + IUnknown_Release(unk); + HeapFree(GetProcessHeap(), 0, data); + + return hr; } /******************************************************************************

1 0

Alexandre Julliard : ntdll: Avoid putting the virtual heap in the low 2Gb on 64-bit.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 156ba4eddfd14333e205957f78ef39373656c30c URL: http://source.winehq.org/git/wine.git/?a=commit;h=156ba4eddfd14333e205957f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 20:02:25 2010 +0100 ntdll: Avoid putting the virtual heap in the low 2Gb on 64-bit. --- dlls/ntdll/virtual.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 3ce0884..c22455d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -140,6 +140,7 @@ static void *user_space_limit; static void *working_set_limit; static void *address_space_start = (void *)0x10000; #endif /* __i386__ */ +static const int is_win64 = (sizeof(void *) > sizeof(int)); #define ROUND_ADDR(addr,mask) \ ((void *)((UINT_PTR)(addr) & ~(UINT_PTR)(mask))) @@ -1357,6 +1358,7 @@ static int alloc_virtual_heap( void *base, size_t size, void *arg ) if (is_beyond_limit( base, size, address_space_limit )) address_space_limit = (char *)base + size; if (size < VIRTUAL_HEAP_SIZE) return 0; + if (is_win64 && base < (void *)0x80000000) return 0; *heap_base = wine_anon_mmap( (char *)base + size - VIRTUAL_HEAP_SIZE, VIRTUAL_HEAP_SIZE, PROT_READ|PROT_WRITE, MAP_FIXED ); return (*heap_base != (void *)-1);

1 0

Alexandre Julliard : libwine: Reserve memory areas for 64-bit in case we don't have a preloader.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: ea8ee88f9825bf4da91b1d0931e2c76b95a682d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea8ee88f9825bf4da91b1d093… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 13:25:41 2010 +0100 libwine: Reserve memory areas for 64-bit in case we don't have a preloader. --- libs/wine/mmap.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index b400189..f0665b1 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -243,8 +243,7 @@ static inline int mmap_reserve( void *addr, size_t size ) * * Reserve as much memory as possible in the given area. */ -#ifdef __i386__ -static void reserve_area( void *addr, void *end ) +static inline void reserve_area( void *addr, void *end ) { size_t size = (char *)end - (char *)addr; @@ -294,7 +293,7 @@ static void reserve_area( void *addr, void *end ) * Solaris malloc is not smart enough to obtain space through mmap(), so try to make * sure that there is some available sbrk() space before we reserve other things. */ -static void reserve_malloc_space( size_t size ) +static inline void reserve_malloc_space( size_t size ) { #ifdef __sun size_t i, count = size / 1024; @@ -309,15 +308,13 @@ static void reserve_malloc_space( size_t size ) #endif } -#endif /* __i386__ */ - /*********************************************************************** * reserve_dos_area * * Reserve the DOS area (0x00000000-0x00110000). */ -static void reserve_dos_area(void) +static inline void reserve_dos_area(void) { const size_t page_size = getpagesize(); const size_t dos_area_size = 0x110000; @@ -341,9 +338,9 @@ static void reserve_dos_area(void) */ void mmap_init(void) { +#ifdef __i386__ struct reserved_area *area; struct list *ptr; -#ifdef __i386__ char stack; char * const stack_ptr = &stack; char *user_space_limit = (char *)0x7ffe0000; @@ -383,7 +380,6 @@ void mmap_init(void) reserve_area( base, end ); } else reserve_area( user_space_limit, 0 ); -#endif /* __i386__ */ /* reserve the DOS area if not already done */ @@ -394,6 +390,18 @@ void mmap_init(void) if (!area->base) return; /* already reserved */ } reserve_dos_area(); + +#elif defined(__x86_64__) + + if (!list_head( &reserved_areas )) + { + /* if we don't have a preloader, try to reserve the space now */ + reserve_area( (void *)0x000000010000, (void *)0x000068000000 ); + reserve_area( (void *)0x00007ff00000, (void *)0x00007fff0000 ); + reserve_area( (void *)0x7ffffe000000, (void *)0x7fffffff0000 ); + } + +#endif }

1 0

Alexandre Julliard : libwine: Use the 64-bit preloader when starting 64-bit wine.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 5af634fd3b7ff7e4d6f8af34f6139315fdbbc8c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af634fd3b7ff7e4d6f8af34f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 17:59:30 2010 +0100 libwine: Use the 64-bit preloader when starting 64-bit wine. --- libs/wine/config.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 93dc7e0..4a2bced 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -97,6 +97,14 @@ static char *xstrdup( const char *str ) return res; } +/* check if a string ends in a given substring */ +static inline int strendswith( const char* str, const char* end ) +{ + size_t len = strlen( str ); + size_t tail = strlen( end ); + return len >= tail && !strcmp( str + len - tail, end ); +} + /* remove all trailing slashes from a path name */ static inline void remove_trailing_slashes( char *path ) { @@ -448,19 +456,23 @@ const char *wine_get_build_id(void) /* exec a binary using the preloader if requested; helper for wine_exec_wine_binary */ static void preloader_exec( char **argv, int use_preloader ) { -#if defined(linux) && defined(__i386__) +#ifdef linux if (use_preloader) { static const char preloader[] = "wine-preloader"; + static const char preloader64[] = "wine64-preloader"; char *p, *full_name; char **last_arg = argv, **new_argv; if (!(p = strrchr( argv[0], '/' ))) p = argv[0]; else p++; - full_name = xmalloc( p - argv[0] + sizeof(preloader) ); + full_name = xmalloc( p - argv[0] + sizeof(preloader64) ); memcpy( full_name, argv[0], p - argv[0] ); - memcpy( full_name + (p - argv[0]), preloader, sizeof(preloader) ); + if (strendswith( p, "64" )) + memcpy( full_name + (p - argv[0]), preloader64, sizeof(preloader64) ); + else + memcpy( full_name + (p - argv[0]), preloader, sizeof(preloader) ); /* make a copy of argv */ while (*last_arg) last_arg++; @@ -480,13 +492,10 @@ static void preloader_exec( char **argv, int use_preloader ) void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ) { const char *path, *pos, *ptr; - int use_preloader = 0; + int use_preloader; - if (!name) /* no name means default loader */ - { - name = argv0_name; - use_preloader = 1; - } + if (!name) name = argv0_name; /* no name means default loader */ + use_preloader = !strendswith( name, "wineserver" ); if ((ptr = strrchr( name, '/' ))) {

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

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

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

17 Dec '10

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

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 December 2010