December 2010 - Wine-Commits

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

Dec. 17, 2010

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

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

Dec. 17, 2010

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

Hwang YunSong : clock: Update Korean resource.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 7f9dfeb939a4c0d23759ba71d216829cb1af62c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9dfeb939a4c0d23759ba71d… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Dec 16 17:07:55 2010 +0900 clock: Update Korean resource. --- programs/clock/Ko.rc | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/programs/clock/Ko.rc b/programs/clock/Ko.rc index 75084a9..f61b9d7 100644 --- a/programs/clock/Ko.rc +++ b/programs/clock/Ko.rc @@ -4,6 +4,7 @@ * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2004 Mike McCormack + * Copyright 2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,29 +23,31 @@ #include "clock_res.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT MAIN_MENU MENU { - POPUP "�� (&P)" { - MENUITEM "�Ƴ��α�(&L)", IDM_ANALOG - MENUITEM "��(&T)", IDM_DIGITAL + POPUP "등록 정보(&P)" { + MENUITEM "아날로그(&L)", IDM_ANALOG + MENUITEM "디지털(&T)", IDM_DIGITAL MENUITEM SEPARATOR - MENUITEM "�۲�(&F)...", IDM_FONT + MENUITEM "글꼴(&F)...", IDM_FONT MENUITEM SEPARATOR - MENUITEM "�� ǥ�� (&W)", IDM_NOTITLE + MENUITEM "제목 표시 안함 (&W)", IDM_NOTITLE MENUITEM SEPARATOR - MENUITEM "��(&S)", IDM_SECONDS - MENUITEM "��¥(&D)", IDM_DATE + MENUITEM "초(&S)", IDM_SECONDS + MENUITEM "날짜(&D)", IDM_DATE MENUITEM SEPARATOR - MENUITEM "�׻� �տ� (&A)", IDM_ONTOP + MENUITEM "항상 앞에 (&A)", IDM_ONTOP } - POPUP "��(&O)" { - MENUITEM "�ð� ��(&A)...", IDM_ABOUT + POPUP "정보(&O)" { + MENUITEM "시계 정보(&A)...", IDM_ABOUT } } STRINGTABLE { -IDS_CLOCK, "�ð�" +IDS_CLOCK, "시계" }

1 0

Jacek Caban : winetest: Make win9x unsupported.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: a3217c89236d40d288e7c765cd400ace78a7fa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3217c89236d40d288e7c765c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 16 15:29:59 2010 +0100 winetest: Make win9x unsupported. It's still possible to run tests with this patch, but results won't be submitted. --- programs/winetest/main.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 7caf9f9..5a7109a 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1162,8 +1162,13 @@ int main( int argc, char *argv[] ) } } if (!submit && !extract) { + int is_win9x = (GetVersion() & 0x80000000) != 0; + report (R_STATUS, "Starting up"); + if (is_win9x) + report (R_WARNING, "Running on win9x is not supported. You won't be able to submit results."); + if (!running_on_visible_desktop ()) report (R_FATAL, "Tests must be run on a visible desktop"); @@ -1208,7 +1213,7 @@ int main( int argc, char *argv[] ) DeleteFileA(logname); exit (0); } - if (build_id[0] && nr_of_skips <= SKIP_LIMIT && !nr_native_dlls && + if (build_id[0] && nr_of_skips <= SKIP_LIMIT && !nr_native_dlls && !is_win9x && report (R_ASK, MB_YESNO, "Do you want to submit the test results?") == IDYES) if (!send_file (logname) && !DeleteFileA(logname)) report (R_WARNING, "Can't remove logfile: %u", GetLastError());

1 0

Huw Davies : include: Add GLYPHSET flag define.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

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

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

Dec. 17, 2010

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

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

Dec. 17, 2010

Module: wine Branch: master Commit: 1fdece9b823a3755003a681f1cd279410bd1c461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fdece9b823a3755003a681f1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:22 2010 +0100 oleaut32: Use ifaces instead of vtbl pointers in OLEFontImpl. --- dlls/oleaut32/olefont.c | 189 ++++++++++++++++++++++++----------------------- 1 files changed, 97 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fdece9b823a3755003a6…

1 0

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

Dec. 17, 2010

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 Dec. 17, 2010

Dec. 17, 2010

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 : ole32: Standardize the COM usage in clipboard.c.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 0207e413c1d58b36b8c78edd637304f70b105c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0207e413c1d58b36b8c78edd6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:21 2010 +0100 ole32: Standardize the COM usage in clipboard.c. --- dlls/ole32/clipboard.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 3064bb0..67b4350 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -138,7 +138,7 @@ static inline DWORD_PTR td_get_offs(ole_priv_data *data, DWORD idx) */ typedef struct snapshot { - const IDataObjectVtbl* lpVtbl; + IDataObject IDataObject_iface; LONG ref; DWORD seq_no; /* Clipboard sequence number corresponding to this snapshot */ @@ -161,7 +161,7 @@ typedef struct ole_clipbrd static inline snapshot *impl_from_IDataObject(IDataObject *iface) { - return (snapshot*)((char*)iface - FIELD_OFFSET(snapshot, lpVtbl)); + return CONTAINING_RECORD(iface, snapshot, IDataObject_iface); } typedef struct PresentationDataHeader @@ -226,7 +226,7 @@ static inline char *dump_fmtetc(FORMATETC *fmt) typedef struct enum_fmtetc { - const IEnumFORMATETCVtbl *lpVtbl; + IEnumFORMATETC IEnumFORMATETC_iface; LONG ref; UINT pos; /* current enumerator position */ @@ -235,7 +235,7 @@ typedef struct enum_fmtetc static inline enum_fmtetc *impl_from_IEnumFORMATETC(IEnumFORMATETC *iface) { - return (enum_fmtetc*)((char*)iface - FIELD_OFFSET(enum_fmtetc, lpVtbl)); + return CONTAINING_RECORD(iface, enum_fmtetc, IEnumFORMATETC_iface); } /************************************************************************ @@ -440,12 +440,12 @@ static HRESULT enum_fmtetc_construct(ole_priv_data *data, UINT pos, IEnumFORMATE if (!ef) return E_OUTOFMEMORY; ef->ref = 1; - ef->lpVtbl = &efvt; + ef->IEnumFORMATETC_iface.lpVtbl = &efvt; ef->data = data; ef->pos = pos; TRACE("(%p)->()\n", ef); - *obj = (IEnumFORMATETC *)ef; + *obj = &ef->IEnumFORMATETC_iface; return S_OK; } @@ -1501,7 +1501,7 @@ static snapshot *snapshot_construct(DWORD seq_no) This = HeapAlloc( GetProcessHeap(), 0, sizeof(*This) ); if (!This) return NULL; - This->lpVtbl = &snapshot_vtable; + This->IDataObject_iface.lpVtbl = &snapshot_vtable; This->ref = 0; This->seq_no = seq_no; This->data = NULL; @@ -2016,7 +2016,7 @@ HRESULT WINAPI OleGetClipboard(IDataObject **obj) if(!clipbrd->latest_snapshot) return E_OUTOFMEMORY; } - *obj = (IDataObject*)&clipbrd->latest_snapshot->lpVtbl; + *obj = &clipbrd->latest_snapshot->IDataObject_iface; IDataObject_AddRef(*obj); return S_OK;

1 0