April 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : Wine release 1.1.43
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: website Branch: master Commit: dcb55135b7837931a6dab5134cef7bb8c077c87e URL: http://source.winehq.org/git/website.git/?a=commit;h=dcb55135b7837931a6dab5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 20:04:50 2010 +0200 Wine release 1.1.43 --- news/en/2010041601.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2010041601.xml b/news/en/2010041601.xml new file mode 100644 index 0000000..56ff89a --- /dev/null +++ b/news/en/2010041601.xml @@ -0,0 +1,17 @@ +<news> +<date>April 16, 2010</date> +<title>Wine 1.1.43 Released</title> +<body> + The Wine development release 1.1.43 is now available. + <a href="{$root}/announce/1.1.43">What's new</a> in this release: +<ul> + <li>A number of new icons.</li> + <li>Improved support for alpha channel in bitmaps.</li> + <li>Many Direct3D fixes and optimizations.</li> + <li>More complete msvcr80/90 implementations.</li> + <li>A wide range of 64-bit fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.43.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.1.43.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 780981bc7a2c8e173bea580a2d748fd7cb242468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=780981bc7a2c8e173bea580a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 19:53:23 2010 +0200 Release 1.1.43. --- ANNOUNCE | 1110 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 512 insertions(+), 618 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=780981bc7a2c8e173bea5…

1 0

Tag wine-1.1.43 : Alexandre Julliard : Release 1.1.43
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: refs/tags/wine-1.1.43 Tag: 6728d988f184927bfa3ccec312ebd9a4590f213f URL: http://source.winehq.org/git/wine.git/?a=tag;h=6728d988f184927bfa3ccec312eb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 19:53:23 2010 +0200 Release 1.1.43

1 0

Eric Pouech : winedbg: Add support for x86-64 in known CPUs while reading minidumps.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: e45a0b7ab37f50415acca8446ece312f455e3bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45a0b7ab37f50415acca8446… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 15 22:16:58 2010 +0200 winedbg: Add support for x86-64 in known CPUs while reading minidumps. --- programs/winedbg/tgt_minidump.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index a4a1af7..41b6f67 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -253,6 +253,9 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) case PROCESSOR_ARCHITECTURE_PPC: str = "PowerPC"; break; + case PROCESSOR_ARCHITECTURE_AMD64: + str = "X86_64"; + break; default: str = "???"; break;

1 0

Eric Pouech : winedump: Add support for x86-64 in known CPUs while reading minidumps.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: f4f3033daaa61f76081e6ae7868c7915fe46c120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f3033daaa61f76081e6ae78… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 15 22:16:58 2010 +0200 winedump: Add support for x86-64 in known CPUs while reading minidumps. --- tools/winedump/minidump.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 2ea4c54..d860768 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -287,11 +287,14 @@ void mdmp_dump(void) case PROCESSOR_ARCHITECTURE_ARM: str = "ARM"; break; + case PROCESSOR_ARCHITECTURE_AMD64: + str = "X86_64"; + break; default: str = "???"; break; } - printf(" Processor: %s, #%d CPUs)\n", str, msi->u.s.NumberOfProcessors); + printf(" Processor: %s (#%d CPUs)\n", str, msi->u.s.NumberOfProcessors); switch (msi->MajorVersion) { case 3:

1 0

Eric Pouech : winedbg: Fix minidump support on 64bit OSes (don' t clamp addresses out of 64bit minidumps).
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: a18fdfc07eeed55fe3d3d157cc3beaa0c38684d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a18fdfc07eeed55fe3d3d157c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 15 22:17:04 2010 +0200 winedbg: Fix minidump support on 64bit OSes (don't clamp addresses out of 64bit minidumps). --- programs/winedbg/tgt_minidump.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 41b6f67..f099b4e 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -40,9 +40,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); static struct be_process_io be_process_minidump_io; -static DWORD64 get_addr64(DWORD64 addr) +/* we need this function on 32bit hosts to ensure we zero out the higher DWORD + * stored in the minidump file (sometimes it's not cleared, or the conversion from + * 32bit to 64bit wide integers is done as signed, which is wrong) + * So we clamp on 32bit CPUs (as stored in minidump information) all addresses to + * keep only the lower 32 bits. + * FIXME: as of today, since we don't support a backend CPU which is different from + * CPU this process is running on, casting to (DWORD_PTR) will do just fine. + */ +static inline DWORD64 get_addr64(DWORD64 addr) { - return addr & 0xFFFFFFFF; + return (DWORD_PTR)addr; } void minidump_write(const char* file, const EXCEPTION_RECORD* rec)

1 0

Eric Pouech : kernel32: Added proper support for GetSystemInfo on x86_64.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 409033cb6af6cae42146a22cba6f37e6a5ef3f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=409033cb6af6cae42146a22cb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 15 22:16:52 2010 +0200 kernel32: Added proper support for GetSystemInfo on x86_64. --- dlls/kernel32/cpu.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index d08e429..5862eac 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -153,6 +153,9 @@ VOID WINAPI GetSystemInfo( default: si->dwProcessorType = 0; } break; + case PROCESSOR_ARCHITECTURE_AMD64: + si->dwProcessorType = PROCESSOR_AMD_X8664; + break; default: FIXME("Unknown processor architecture %x\n", sci.Architecture); } si->dwAllocationGranularity = sbi.AllocationGranularity;

1 0

Alexandre Julliard : ntdll: Report the correct processor architecture.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 4fc65126cfedca1451eaaaeb49bc0d0f982a4236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc65126cfedca1451eaaaeb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 16:59:01 2010 +0200 ntdll: Report the correct processor architecture. --- dlls/ntdll/nt.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index b262c1e..e7700a1 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -888,8 +888,18 @@ void fill_cpu_info(void) /* choose sensible defaults ... * FIXME: perhaps overridable with precompiler flags? */ +#ifdef __i386__ cached_sci.Architecture = PROCESSOR_ARCHITECTURE_INTEL; cached_sci.Level = 5; /* 586 */ +#elif defined(__x86_64__) + cached_sci.Architecture = PROCESSOR_ARCHITECTURE_AMD64; +#elif defined(__powerpc__) + cached_sci.Architecture = PROCESSOR_ARCHITECTURE_PPC; +#elif defined(__ALPHA__) + cached_sci.Architecture = PROCESSOR_ARCHITECTURE_ALPHA; +#else +#error Unknown CPU +#endif cached_sci.Revision = 0; cached_sci.Reserved = 0; cached_sci.FeatureSet = 0x1fff; /* FIXME: set some sensible defaults out of ProcessFeatures[] */

1 0

Alexandre Julliard : winex11: Fix 16-bpp cursor conversions.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 6ef5ccb90e84dcfbfff9e645e5c24e40542b1888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef5ccb90e84dcfbfff9e645e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 16:23:59 2010 +0200 winex11: Fix 16-bpp cursor conversions. --- dlls/winex11.drv/mouse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 60351e5..211edfb 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -538,7 +538,7 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) tmp = (*xor_ptr++ & 0xe0) >> 5; tmp |= (*xor_ptr & 0x07) << 3; *pixel_ptr |= convert_6to8[tmp] << 16; - *pixel_ptr |= convert_5to8[*xor_ptr & 0xf8] << 24; + *pixel_ptr |= convert_5to8[*xor_ptr++ >> 3] << 24; break; case 1:

1 0

Alexandre Julliard : appwiz.cpl: Use the fancy new icon.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 20f899e78971ff8195ac7ca5e0a85e6d92a2615b URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f899e78971ff8195ac7ca5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 16:24:28 2010 +0200 appwiz.cpl: Use the fancy new icon. --- dlls/appwiz.cpl/appwiz.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 98b1019..2b68ee7 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -899,6 +899,17 @@ static BOOL CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar return FALSE; } +static int CALLBACK propsheet_callback( HWND hwnd, UINT msg, LPARAM lparam ) +{ + switch (msg) + { + case PSCB_INITIALIZED: + SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( hInst, MAKEINTRESOURCEW(ICO_MAIN) )); + break; + } + return 0; +} + /****************************************************************************** * Name : StartApplet * Description: Main routine for applet @@ -928,14 +939,14 @@ static void StartApplet(HWND hWnd) /* Fill out the PROPSHEETHEADER */ psh.dwSize = sizeof (PROPSHEETHEADERW); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hWnd; psh.hInstance = hInst; - psh.u.pszIcon = NULL; + psh.u.pszIcon = MAKEINTRESOURCEW(ICO_MAIN); psh.pszCaption = app_title; psh.nPages = 1; psh.u3.ppsp = &psp; - psh.pfnCallback = NULL; + psh.pfnCallback = propsheet_callback; psh.u2.nStartPage = 0; /* Display the property sheet */

1 0