wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Nikolay Sivov : shell32: Implement IShellImageData::Decode() when created from file path.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: d9d99834f604402a2897037455261f9dd7d98c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d99834f604402a289703745… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 7 19:27:31 2017 +0300 shell32: Implement IShellImageData::Decode() when created from file path. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/shellole.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- include/shimgdata.idl | 9 ++++++++- 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 038db7f..970ecba 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_SHELL32_ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32 -DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 +DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus EXTRALIBS = $(CORESERVICES_LIBS) # AUTHORS file is in the top-level directory EXTRAINCL = -I$(top_srcdir) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index deef21c..46a7b03 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -36,6 +36,7 @@ #include "shlobj.h" #include "shlguid.h" #include "shldisp.h" +#include "gdiplus.h" #include "shimgdata.h" #include "winreg.h" #include "winerror.h" @@ -811,6 +812,23 @@ HRESULT WINAPI SHCreateQueryCancelAutoPlayMoniker(IMoniker **moniker) return CreateClassMoniker(&CLSID_QueryCancelAutoPlay, moniker); } +static HRESULT gpstatus_to_hresult(GpStatus status) +{ + switch (status) + { + case Ok: + return S_OK; + case InvalidParameter: + return E_INVALIDARG; + case OutOfMemory: + return E_OUTOFMEMORY; + case NotImplemented: + return E_NOTIMPL; + default: + return E_FAIL; + } +} + /* IShellImageData */ typedef struct { @@ -818,6 +836,7 @@ typedef struct LONG ref; WCHAR *path; + GpImage *image; } ShellImageData; static inline ShellImageData *impl_from_IShellImageData(IShellImageData *iface) @@ -861,6 +880,7 @@ static ULONG WINAPI ShellImageData_Release(IShellImageData *iface) if (!ref) { + GdipDisposeImage(This->image); HeapFree(GetProcessHeap(), 0, This->path); SHFree(This); } @@ -871,10 +891,30 @@ static ULONG WINAPI ShellImageData_Release(IShellImageData *iface) static HRESULT WINAPI ShellImageData_Decode(IShellImageData *iface, DWORD flags, ULONG cx_desired, ULONG cy_desired) { ShellImageData *This = impl_from_IShellImageData(iface); + GpImage *image; + HRESULT hr; - FIXME("%p, %#x, %u, %u: stub\n", This, flags, cx_desired, cy_desired); + TRACE("%p, %#x, %u, %u\n", This, flags, cx_desired, cy_desired); - return E_NOTIMPL; + if (This->image) + return S_FALSE; + + if (flags & SHIMGDEC_LOADFULL) + FIXME("LOADFULL flag ignored\n"); + + hr = gpstatus_to_hresult(GdipLoadImageFromFile(This->path, &image)); + if (FAILED(hr)) + return hr; + + if (flags & SHIMGDEC_THUMBNAIL) + { + hr = gpstatus_to_hresult(GdipGetImageThumbnail(image, cx_desired, cy_desired, &This->image, NULL, NULL)); + GdipDisposeImage(image); + } + else + This->image = image; + + return hr; } static HRESULT WINAPI ShellImageData_Draw(IShellImageData *iface, HDC hdc, RECT *dest, RECT *src) @@ -1186,6 +1226,7 @@ static HRESULT create_shellimagedata_from_path(const WCHAR *path, IShellImageDat This->ref = 1; This->path = strdupW(path); + This->image = NULL; *data = &This->IShellImageData_iface; return S_OK; diff --git a/include/shimgdata.idl b/include/shimgdata.idl index 2e84298..e913c57 100644 --- a/include/shimgdata.idl +++ b/include/shimgdata.idl @@ -27,11 +27,18 @@ cpp_quote("#ifndef _GDIPLUSENUMS_H") typedef DWORD InterpolationMode; cpp_quote("#endif") -cpp_quote("#ifndef _GDIPLUSHEADERS_H") +cpp_quote("#ifndef _GDIPLUSIMAGING_H") typedef BYTE EncoderParameters; +cpp_quote("#endif") + +cpp_quote("#ifndef _GDIPLUSHEADERS_H") typedef BYTE Image; cpp_quote("#endif") +cpp_quote("#define SHIMGDEC_DEFAULT 0x0") +cpp_quote("#define SHIMGDEC_THUMBNAIL 0x1") +cpp_quote("#define SHIMGDEC_LOADFULL 0x2") + [ object, uuid(53fb8e58-50c0-4003-b4aa-0c8df28e7f3a)

1 0

Nikolay Sivov : shell32: Added IShellImageData stub.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: f04b66e68f9dff392e1eec771062683c767d9942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f04b66e68f9dff392e1eec771… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 7 19:27:30 2017 +0300 shell32: Added IShellImageData stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.h | 10 ++ dlls/shell32/shelllink.c | 10 -- dlls/shell32/shellole.c | 384 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 392 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f04b66e68f9dff392e1ee…

1 0

Detlef Riekenberg : winspool/tests: Test LastError on success of AddMonitor.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 72ca331431feef9cc3f5251876bf64caff7e19ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ca331431feef9cc3f525187… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 8 09:03:45 2017 +0000 winspool/tests: Test LastError on success of AddMonitor. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index f6527c5..3c28bc0 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -434,7 +434,9 @@ static void test_AddMonitor(void) mi2a.pDLLName = entry->dllname; SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); - ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); + /* Some apps depend on the result of GetLastError() also on success of AddMonitor */ + ok(res && (GetLastError() == ERROR_SUCCESS), + "returned %d with %d (expected '!= 0' with ERROR_SUCCESS)\n", res, GetLastError()); /* add a monitor twice */ SetLastError(MAGIC_DEAD);

1 0

Detlef Riekenberg : localspl: Clear LastError on success in AddMonitor.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 54e52897f89ad09a7e4d2d7c1fecd31b46d7989a URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e52897f89ad09a7e4d2d7c1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 8 09:03:44 2017 +0000 localspl: Clear LastError on success in AddMonitor. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index f359b73..4f6bac3 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1507,6 +1507,8 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) } monitor_unload(pm); + SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ + if (RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { ERR("unable to create key %s\n", debugstr_w(monitorsW)); return FALSE;

1 0

Francois Gouget : winetest: Automatically update @INC for winetest.conf.
by Alexandre Julliard 08 Feb '17

08 Feb '17

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

Francois Gouget : winetest: We may not have a report tag for the error message.
by Alexandre Julliard 08 Feb '17

08 Feb '17

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: Don't count on $TMPDIR staying set.
by Alexandre Julliard 08 Feb '17

08 Feb '17

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: Use a move function that works across filesystems.
by Alexandre Julliard 08 Feb '17

08 Feb '17

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: Set Windows 8 and 10' s test failed limit back to normal.
by Alexandre Julliard 08 Feb '17

08 Feb '17

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

Piotr Caban : msvcrt: Add fesetenv implementation.
by Alexandre Julliard 07 Feb '17

07 Feb '17

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

← Newer
1
...
62
63
64
65
66
67
68
...
84
Older →

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 February 2017