February 2017 - Wine-Commits

Alistair Leslie-Hughes : comsvcs: Register typelib.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 0bff5fb971865baae9130bcb3bb1261202713a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bff5fb971865baae9130bcb3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 8 03:50:01 2017 +0000 comsvcs: Register typelib. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/comsvcs/Makefile.in | 3 +++ dlls/comsvcs/comsvcs_tlb.idl | 22 ++++++++++++++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 24c375d..b2ec13a 100755 --- a/configure +++ b/configure @@ -17798,7 +17798,7 @@ wine_fn_config_dll comm.drv16 enable_win16 wine_fn_config_dll commdlg.dll16 enable_win16 wine_fn_config_dll compobj.dll16 enable_win16 wine_fn_config_dll compstui enable_compstui implib -wine_fn_config_dll comsvcs enable_comsvcs implib +wine_fn_config_dll comsvcs enable_comsvcs clean,implib wine_fn_config_dll concrt140 enable_concrt140 wine_fn_config_dll connect enable_connect wine_fn_config_dll credui enable_credui clean,implib diff --git a/configure.ac b/configure.ac index c6d63b2..43f19de 100644 --- a/configure.ac +++ b/configure.ac @@ -2856,7 +2856,7 @@ WINE_CONFIG_DLL(comm.drv16,enable_win16) WINE_CONFIG_DLL(commdlg.dll16,enable_win16) WINE_CONFIG_DLL(compobj.dll16,enable_win16) WINE_CONFIG_DLL(compstui,,[implib]) -WINE_CONFIG_DLL(comsvcs,,[implib]) +WINE_CONFIG_DLL(comsvcs,,[clean,implib]) WINE_CONFIG_DLL(concrt140) WINE_CONFIG_DLL(connect) WINE_CONFIG_DLL(credui,,[clean,implib]) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index 1bf9f4f..bd71e7d 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -4,3 +4,6 @@ IMPORTS = ole32 C_SRCS = \ main.c + +IDL_SRCS = \ + comsvcs_tlb.idl diff --git a/dlls/comsvcs/comsvcs_tlb.idl b/dlls/comsvcs/comsvcs_tlb.idl new file mode 100644 index 0000000..04041a0 --- /dev/null +++ b/dlls/comsvcs/comsvcs_tlb.idl @@ -0,0 +1,22 @@ +/* + * COM+ Services + * + * Copyright 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#pragma makedep regtypelib + +#include "comsvcs.idl"

1 0

Nikolay Sivov : secur32: Pass correct buffer length to RegQueryValueExW().
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 3769d5750c9849ae007a9a3a5f31f7d383605ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3769d5750c9849ae007a9a3a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 15:15:20 2017 +0300 secur32: Pass correct buffer length to RegQueryValueExW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index c7e353f..d3cbb9b 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -575,7 +575,7 @@ static void SECUR32_initializeProviders(void) if (apiRet == ERROR_SUCCESS) { WCHAR securityPkgNames[MAX_PATH]; /* arbitrary len */ - DWORD size = sizeof(securityPkgNames) / sizeof(WCHAR), type; + DWORD size = sizeof(securityPkgNames), type; apiRet = RegQueryValueExW(key, securityProvidersW, NULL, &type, (PBYTE)securityPkgNames, &size);

1 0

Nikolay Sivov : oleaut32: Return proper interface pointers.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 9e54ae767e761dce16abb3696cbe8b8f8dff5c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e54ae767e761dce16abb3696… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 16:02:31 2017 +0300 oleaut32: Return proper interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 2 +- dlls/oleaut32/typelib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index bfca22f..ac8b207 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -461,7 +461,7 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface( *ppvObject = 0; if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPicture, riid)) - *ppvObject = This; + *ppvObject = &This->IPicture_iface; else if (IsEqualIID(&IID_IDispatch, riid)) *ppvObject = &This->IDispatch_iface; else if (IsEqualIID(&IID_IPictureDisp, riid)) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4fdfbeb..3df9631 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5579,7 +5579,7 @@ static HRESULT WINAPI ITypeInfo_fnQueryInterface( if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid,&IID_ITypeInfo)|| IsEqualIID(riid,&IID_ITypeInfo2)) - *ppvObject = This; + *ppvObject = &This->ITypeInfo2_iface; else if(IsEqualIID(riid, &IID_ICreateTypeInfo) || IsEqualIID(riid, &IID_ICreateTypeInfo2)) *ppvObject = &This->ICreateTypeInfo2_iface;

1 0

Nikolay Sivov : shell32: Implement IShellImageData::GetSize().
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 5222eca2d5c159ce78f686fd723cdda9a89ebbe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5222eca2d5c159ce78f686fd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 7 19:27:32 2017 +0300 shell32: Implement IShellImageData::GetSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellole.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 46a7b03..8fb981c 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -1046,10 +1046,22 @@ static HRESULT WINAPI ShellImageDate_SelectPage(IShellImageData *iface, ULONG pa static HRESULT WINAPI ShellImageData_GetSize(IShellImageData *iface, SIZE *size) { ShellImageData *This = impl_from_IShellImageData(iface); + REAL cx, cy; + HRESULT hr; - FIXME("%p, %p: stub\n", This, size); + TRACE("%p, %p\n", This, size); - return E_NOTIMPL; + if (!This->image) + return E_FAIL; + + hr = gpstatus_to_hresult(GdipGetImageDimension(This->image, &cx, &cy)); + if (SUCCEEDED(hr)) + { + size->cx = cx; + size->cy = cy; + } + + return hr; } static HRESULT WINAPI ShellImageData_GetRawDataFormat(IShellImageData *iface, GUID *format)

1 0

Francois Gouget : winetest: We may not have a report tag for the error message.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: tools Branch: master Commit: 0a55c3acb2097e16acef12104fc26d9fcb2c7cca URL: http://source.winehq.org/git/tools.git/?a=commit;h=0a55c3acb2097e16acef1210… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 08:08:06 2017 +0100 winetest: We may not have a report tag for the error message. For instance if the commit id is not valid we issue the error message before $tag is set. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index ccb6d1d..f5b6744 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -63,7 +63,7 @@ sub mydie(@) { print STDERR "$name0:error: unable to rename '$tmpdir' to '$errdir': $!\n"; exit 3; } - my $label = substr($tag,1) || "???"; + my $label = $tag ? substr($tag, 1) : "<notag>"; if (open ERR, ">$errdir/error") { print ERR "$label: ", @_;

1 0

Francois Gouget : winetest: Use a move function that works across filesystems.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: tools Branch: master Commit: 5061b7f7e43b5035e3f492ba726c76c7e84168ca URL: http://source.winehq.org/git/tools.git/?a=commit;h=5061b7f7e43b5035e3f492ba… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 08:07:23 2017 +0100 winetest: Use a move function that works across filesystems. If CGI ignores $TMPDIR for any reason, the file will likely be in /tmp, i.e. on a different filesystem. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.cgi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/winetest/winetest.cgi b/winetest/winetest.cgi index 98a5260..93906bf 100755 --- a/winetest/winetest.cgi +++ b/winetest/winetest.cgi @@ -25,6 +25,7 @@ BEGIN { $ENV{TMPDIR} = $queuedir; } +use File::Copy; use File::Temp qw(tempdir); use CGI qw(:standard); # Cater for some overhead @@ -50,7 +51,9 @@ sub move_file($) chmod 0777, $tmpdir; chmod 0666&~umask, $orig; my $size = -s $orig; - (rename $orig, "$tmpdir/report")? + # Note that we are stealing CGI's temporary file which typically results + # in a warning in the web server's logs. Still seems to work though. + (move $orig, "$tmpdir/report")? "Received $filename ($size bytes).\n": "Error: can't store $filename: $!\n"; }

1 0

Francois Gouget : winetest: Don't count on $TMPDIR staying set.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: tools Branch: master Commit: 9be551efdd99ae2504c089b2b979b15e87779b52 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9be551efdd99ae2504c089b2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 08:07:43 2017 +0100 winetest: Don't count on $TMPDIR staying set. The BEGIN code block will be run the first time the web server loads the CGI script. However the web server may use caching techniques that result in the script being run a second time while skipping the BEGIN code block. Furthermore $TMPDIR may have been unset which will cause tempdir(DIR => "") to fail with a permission denied error. Perl variables are preserved however so use them instead. Still set $TMPDIR so the CGI temporary file will be on the right filesystem, resulting in a faster move operation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/winetest.cgi b/winetest/winetest.cgi index 93906bf..93afee5 100755 --- a/winetest/winetest.cgi +++ b/winetest/winetest.cgi @@ -22,7 +22,6 @@ use vars qw/$queuedir $maxfilesize/; BEGIN { require "winetest.conf"; - $ENV{TMPDIR} = $queuedir; } use File::Copy; @@ -30,6 +29,7 @@ use File::Temp qw(tempdir); use CGI qw(:standard); # Cater for some overhead $CGI::POST_MAX = $maxfilesize + 1024; +$ENV{TMPDIR} = $queuedir; my $name = param ("reportfile"); my $error = cgi_error (); @@ -47,7 +47,7 @@ sub move_file($) { my ($filename) = @_; my $orig = tmpFileName($filename); - my $tmpdir = tempdir ("repXXXXX", DIR=>$ENV{TMPDIR}); + my $tmpdir = tempdir ("repXXXXX", DIR => $queuedir); chmod 0777, $tmpdir; chmod 0666&~umask, $orig; my $size = -s $orig;

1 0

Francois Gouget : winetest: Set Windows 8 and 10' s test failed limit back to normal.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: tools Branch: master Commit: ee17ccb6e73c5d10d0a3d06d837e920100ac5cd2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ee17ccb6e73c5d10d0a3d06d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 08:06:21 2017 +0100 winetest: Set Windows 8 and 10's test failed limit back to normal. They have improved enough that a normal WineTest run should be under the standard limit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 -- 1 file changed, 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 2f2faa1..ccb6d1d 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -218,8 +218,6 @@ if ($plid==1 && $major==4) { } elsif ($plid==3) { #$version = "ce$major$minor"; } -# Give a little slack to the new platforms. -$maxfailedtests += 20 if ($version eq "win8" || $version eq "win10"); if ($prediluvian and not $acceptprediluvianwin) { mydie "platform $version not accepted\n"; }

1 0

Francois Gouget : winetest: Automatically update @INC for winetest.conf.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: tools Branch: master Commit: b701141d429473ed49c80ffdbc06a1093a65ed41 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b701141d429473ed49c80ffd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 08:09:39 2017 +0100 winetest: Automatically update @INC for winetest.conf. This lets the build-index, dissect and gather scripts automatically find the configuration file. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 10 ++++++++++ winetest/dissect | 10 ++++++++++ winetest/gather | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/winetest/build-index b/winetest/build-index index 5f00f5d..349144f 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -25,6 +25,16 @@ use open ':utf8'; use CGI qw(:standard); use POSIX qw(strftime); +sub BEGIN +{ + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); +} use vars qw/$gitdir $gitweb $queuedir/; require "winetest.conf"; diff --git a/winetest/dissect b/winetest/dissect index f5b6744..d9404fe 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -38,6 +38,16 @@ use open ':utf8'; use CGI qw(:standard); charset("utf-8"); +sub BEGIN +{ + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); +} use vars qw/$gitdir $gitweb $queuedir $datadir $maxmult $maxuserskips $maxfailedtests $maxfilesize $acceptprediluvianwin/; require "winetest.conf"; diff --git a/winetest/gather b/winetest/gather index 74c6734..10ed2da 100755 --- a/winetest/gather +++ b/winetest/gather @@ -35,6 +35,16 @@ use warnings; use CGI qw(:standard); charset("utf-8"); +sub BEGIN +{ + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); +} use vars qw/$datadir $gitweb/; require "winetest.conf";

1 0

Piotr Caban : msvcrt: Add fesetenv implementation.
by Alexandre Julliard Feb. 7, 2017

Feb. 7, 2017

Module: wine Branch: master Commit: 98a0c3df2e640fba5312acbeb07fd527e9c24b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a0c3df2e640fba5312acbeb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 7 17:42:43 2017 +0100 msvcrt: Add fesetenv implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index db8e441..74685d4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1272,8 +1272,67 @@ void CDECL _fpreset(void) */ int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) { - FIXME("(%p) stub\n", env); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + struct { + WORD control_word; + WORD unused1; + WORD status_word; + WORD unused2; + WORD tag_word; + WORD unused3; + DWORD instruction_pointer; + WORD code_segment; + WORD unused4; + DWORD operand_addr; + WORD data_segment; + WORD unused5; + } fenv; + + TRACE( "(%p)\n", env ); + + if (!env->control && !env->status) { + _fpreset(); + return 0; + } + + __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) ); + + fenv.control_word &= ~0x3d; + if (env->control & MSVCRT__EM_INVALID) fenv.control_word |= 0x1; + if (env->control & MSVCRT__EM_ZERODIVIDE) fenv.control_word |= 0x4; + if (env->control & MSVCRT__EM_OVERFLOW) fenv.control_word |= 0x8; + if (env->control & MSVCRT__EM_UNDERFLOW) fenv.control_word |= 0x10; + if (env->control & MSVCRT__EM_INEXACT) fenv.control_word |= 0x20; + + fenv.status_word &= ~0x3d; + if (env->status & MSVCRT__SW_INVALID) fenv.status_word |= 0x1; + if (env->status & MSVCRT__SW_ZERODIVIDE) fenv.status_word |= 0x4; + if (env->status & MSVCRT__SW_OVERFLOW) fenv.status_word |= 0x8; + if (env->status & MSVCRT__SW_UNDERFLOW) fenv.status_word |= 0x10; + if (env->status & MSVCRT__SW_INEXACT) fenv.status_word |= 0x20; + + __asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)", + "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" ); + + if (sse2_supported) + { + DWORD fpword; + + __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); + fpword &= ~0x1e80; + if (env->control & MSVCRT__EM_INVALID) fpword |= 0x80; + if (env->control & MSVCRT__EM_ZERODIVIDE) fpword |= 0x200; + if (env->control & MSVCRT__EM_OVERFLOW) fpword |= 0x400; + if (env->control & MSVCRT__EM_UNDERFLOW) fpword |= 0x800; + if (env->control & MSVCRT__EM_INEXACT) fpword |= 0x1000; + __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); + } + return 0; +#else + FIXME( "not implemented\n" ); +#endif + return 1; } /*********************************************************************

1 0