December 2015 - Wine-devel - list.winehq.org

programs/xcopy: Fix casing of usage message
by Hugh McMaster 02 Dec '15

02 Dec '15

On Wednesday, 18 Nov 2015 19:08:29 -0600, Austin English wrote: >- STRING_SIMCOPY, "%1!d! file(s) would be copied\n" >- STRING_COPY, "%1!d! file(s) copied\n" >+ STRING_SIMCOPY, "%1!d! File(s) would be copied\n" >+ STRING_COPY, "%1!d! File(s) copied\n" Hi Austin, You should probably patch all of the po files as well. It's a simple change, and it means Alexandre doesn't have to regenerate everything. -- Hugh McMaster

3 6

Simplified local IP reordering patch for default routes
by Bruno Jesus 02 Dec '15

02 Dec '15

Hi, Jamie and Joachim and list. This is a short version of a long patch I'm working on, it orders the IP list with the default routes on top and it supports more than one default route. It fixes the problem on Linux and FreeBSD, could anyone also test it on OSX, please? This patch does not touch the magic IP so the loopback route will still return the IP 127.12.34.56 but at least it won't be the first one anymore. Thanks in advance, Bruno

3 6

Re: winedbg: Print windows version in system info.
by Austin English 02 Dec '15

02 Dec '15

On Wed, Dec 2, 2015 at 5:20 PM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > From: Michael Müller <michael(a)fds-team.de> > > Signed-off-by: Michael Müller <michael(a)fds-team.de> > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > ... for those who don't have a crystal ball while triaging bug reports. :) > > programs/winedbg/tgt_active.c | 58 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 58 insertions(+) > > diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c > index 989e433..07edccc 100644 > --- a/programs/winedbg/tgt_active.c > +++ b/programs/winedbg/tgt_active.c > @@ -678,6 +678,63 @@ static HANDLE create_temp_file(void) > NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, 0 ); > } > > +static const struct > +{ > + int type; > + int platform; > + int major; > + int minor; > + const char *str; > +} > +version_table[] = > +{ > + { 0, VER_PLATFORM_WIN32s, 2, 0, "2.0" }, > + { 0, VER_PLATFORM_WIN32s, 3, 0, "3.0" }, > + { 0, VER_PLATFORM_WIN32s, 3, 10, "3.1" }, > + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 0, "95" }, > + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 10, "98" }, > + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 90, "ME" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 3, 51, "NT 3.51" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 4, 0, "NT 4.0" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 0, "2000" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 1, "XP" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 2, "XP" }, > + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 5, 2, "Server 2003" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 0, "Vista" }, > + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 0, "Server 2008" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 1, "7" }, > + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 1, "Server 2008 R2" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 2, "8" }, > + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 2, "Server 2012" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 3, "8.1" }, > + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 3, "Server 2012 R2" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 10, 0, "10" }, > +}; > + > +static const char *get_windows_version(void) > +{ > + OSVERSIONINFOEXW info = { sizeof(OSVERSIONINFOEXW) }; > + static char str[64]; > + int i; > + > + GetVersionExW( (OSVERSIONINFOW *)&info ); > + > + for (i = 0; i < sizeof(version_table) / sizeof(version_table[0]); i++) > + { > + if (version_table[i].type == info.wProductType && > + version_table[i].platform == info.dwPlatformId && > + version_table[i].major == info.dwMajorVersion && > + version_table[i].minor == info.dwMinorVersion) > + { > + return version_table[i].str; > + } > + } > + > + snprintf( str, sizeof(str), "%d.%d (%d)", info.dwMajorVersion, > + info.dwMinorVersion, info.wProductType ); > + return str; > +} > + > static void output_system_info(void) > { > #ifdef __i386__ > @@ -705,6 +762,7 @@ static void output_system_info(void) > dbg_printf( "System information:\n" ); > if (wine_get_build_id) dbg_printf( " Wine build: %s\n", wine_get_build_id() ); > dbg_printf( " Platform: %s%s\n", platform, is_wow64 ? " (WOW64)" : "" ); > + dbg_printf( " Version: Windows %s\n", get_windows_version() ); > if (wine_get_host_version) > { > const char *sysname, *release; > -- > 2.6.2 > > With my bugzilla hat on: Thank you!! -- -Austin

1 0

Re: loader/wine.inf.in: add 'HKLM\Software\Classes\Applications\iexplore.exe\shell\open\command' key
by Jacek Caban 02 Dec '15

02 Dec '15

Hi Austin, On 12/02/15 07:31, Austin English wrote: > > From a8309f37269bc374359e6ee473e66465551b867f Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Wed, 2 Dec 2015 01:27:15 -0500 > Subject: [PATCH] loader/wine.inf.in: add > 'HKLM\Software\Classes\Applications\iexplore.exe\shell\open\command' key > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > loader/wine.inf.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in I believe this should go to programs/iexplore/iexplore.inf. > index 58a8d1d..02b92f4 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -245,6 +245,7 @@ HKCR,https\shell\open\ddeexec,"NoActivateHandler",2,"" > HKCR,https\shell\open\ddeexec\Application,,2,"IExplore" > HKCR,https\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" > HKCR,mailto\shell\open\command,,2,"%11%\winebrowser %1" > +HKLM,Software\Classes\Applications\iexplore.exe\shell\open\command,,2,"""%16422%\Internet Explorer\iexplore.exe"" %1" Why don't you use HKCR here? Thanks, Jacek

2 1

Re: [PATCH 3/3] ntdll/tests: Restore old value in a more context independent way.
by Marvin 02 Dec '15

02 Dec '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=18722 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 002D0000/002D0001 exception: unhandled exception 80000004 at 002D0000 exception.c:485: Test failed: 42: Wrong exception address 77BAED97/002D0001 === w7u (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 002F0000/002F0001 exception: unhandled exception 80000004 at 002F0000 exception.c:485: Test failed: 42: Wrong exception address 77CDE34F/002F0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [PATCH 1/3] ntdll/tests: Add SIMD exception test for floating point invalid operation fault (try 4).
by Marvin 02 Dec '15

02 Dec '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=18721 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 003D0000/003D0001 exception: unhandled exception 80000004 at 003D0000 exception.c:485: Test failed: 42: Wrong exception address 77BAED97/003D0001 === w7u (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 002F0000/002F0001 exception: unhandled exception 80000004 at 002F0000 exception.c:485: Test failed: 42: Wrong exception address 77CDE34F/002F0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [PATCH 4/4 v2] dsound: Fail to create a version 8 3d buffer with DSBCAPS_CTRLPAN
by Andrew Eikum 02 Dec '15

02 Dec '15

This looks fine, but since it doesn't fix a bug, I think this one should be deferred. As Michael knows, dsound applications can be fragile... Andrew On Tue, Dec 01, 2015 at 02:49:45PM +0100, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > dlls/dsound/dsound.c | 5 +++++ > dlls/dsound/tests/ds3d8.c | 1 - > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c > index 7b93455..e50ef58 100644 > --- a/dlls/dsound/dsound.c > +++ b/dlls/dsound/dsound.c > @@ -542,6 +542,11 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( > return DSERR_INVALIDPARAM; > } > > + if (from8 && (dsbd->dwFlags & DSBCAPS_CTRL3D) && (dsbd->dwFlags & DSBCAPS_CTRLPAN)) { > + WARN("invalid parameter: DSBCAPS_CTRL3D and DSBCAPS_CTRLPAN cannot be used together\n"); > + return DSERR_INVALIDPARAM; > + } > + > hres = IDirectSoundBufferImpl_Create(device, &dsb, dsbd); > if (dsb) { > *ppdsb = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface; > diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c > index 330f590..25eb010 100644 > --- a/dlls/dsound/tests/ds3d8.c > +++ b/dlls/dsound/tests/ds3d8.c > @@ -654,7 +654,6 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, > /* Invalid flag combination */ > bufdesc.dwFlags|=DSBCAPS_CTRLPAN; > rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); > - todo_wine > ok(rc==DSERR_INVALIDPARAM, > "IDirectSound8_CreateSoundBuffer(secondary) should have " > "returned DSERR_INVALIDPARAM, returned %08x\n", rc); > -- > 2.1.0 > >

1 0

Re: [PATCH 1/2] ntdll/tests: Add SIMD exception test for floating point invalid operation fault (try 3).
by Alexandre Julliard 02 Dec '15

02 Dec '15

Qian Hong <qhong(a)codeweavers.com> writes: > Try 3: > - Correctly revert side effect of previous ldmxcsr, change 0x200 to > 0x80, 0x80 & 0xff7f = 0, 0x200 & 0xfdff = 0. It would be even better to restore the original value, without making assumptions about the previous contents. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [PATCH 1/2] ntdll/tests: Add SIMD exception test for floating point invalid operation fault (try 3).
by Marvin 02 Dec '15

02 Dec '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=18719 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 003D0000/003D0001 exception: unhandled exception 80000004 at 003D0000 exception.c:485: Test failed: 42: Wrong exception address 77BAED97/003D0001 === w7u (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 002F0000/002F0001 exception: unhandled exception 80000004 at 002F0000 exception.c:485: Test failed: 42: Wrong exception address 77CDE34F/002F0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [PATCH] ntdll: Fix valgrind heap realloc notifications.
by Alexandre Julliard 02 Dec '15

02 Dec '15

Thomas Faller <tfaller1(a)gmx.de> writes: > Valgrind can't handle a realloc, if the new size is zero. > Fix for bug https://bugs.winehq.org/show_bug.cgi?id=37646 I'd suggest fixing valgrind, or if not possible, using a size of 1. Your change seems like it would make notifications less useful in several cases. -- Alexandre Julliard julliard(a)winehq.org

1 0