February 2017 - Wine-commits

Francois Gouget : winetest: Skip running build-index if no new report was found.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: tools Branch: master Commit: d479ebd4a58ab7e0ea4a6be88d9342b1d4f7c345 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d479ebd4a58ab7e0ea4a6be8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 10 17:02:52 2017 +0100 winetest: Skip running build-index if no new report was found. While build-index is reasonably fast, running it regenerates the main index, causing it to be redownloaded even if nothing changed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.cron | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 42f52c8..2fb177c 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -28,8 +28,9 @@ if [ ! -f $lock ]; then touch $lock cd $workdir while $tools/dissect; [ $? -eq 0 -o $? -eq 1 ]; do true; done - while $tools/gather; do true; done - $tools/build-index + updated=0 + while $tools/gather; do updated=1; done + [ $updated -eq 1 ] && $tools/build-index # archive old results (cd old-data && dir=`find . -maxdepth 1 -mtime +$expire -type d -print -quit` &&

1 0

Francois Gouget : winetest: Automatically create the directories needed by the cron job.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: tools Branch: master Commit: 2f73328a396129146be84aef6dd28b524a5225d3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2f73328a396129146be84aef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 10 17:05:06 2017 +0100 winetest: Automatically create the directories needed by the cron job. This simplifies the initial setup. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.cron | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 2fb177c..4b60d10 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -27,17 +27,35 @@ expire=120 if [ ! -f $lock ]; then touch $lock cd $workdir + while $tools/dissect; [ $? -eq 0 -o $? -eq 1 ]; do true; done updated=0 while $tools/gather; do updated=1; done - [ $updated -eq 1 ] && $tools/build-index + if [ $updated -eq 1 -o ! -d data/tests -o ! -d old-data ] + then + mkdir -p data/tests old-data + $tools/build-index + fi # archive old results - (cd old-data && dir=`find . -maxdepth 1 -mtime +$expire -type d -print -quit` && - test -n "$dir" && tar cfj $dir.tar.bz2 $dir && touch -r $dir $dir.tar.bz2 && rm -rf $dir) + ( + set -e + cd old-data + dir=`find . -maxdepth 1 -mtime +$expire -type d -print -quit` + test -n "$dir" + tar cfj $dir.tar.bz2 $dir + touch -r $dir $dir.tar.bz2 + rm -rf $dir + ) # remove old test builds - (cd builds && find . -mtime +$expire -name winetest\*.exe -print0 | xargs -0 rm -f) + ( + set -e + mkdir -p builds + cd builds + find . -mtime +$expire -name winetest\*.exe -print0 | \ + xargs -0 rm -f + ) # remove old queue files find queue -maxdepth 1 -mtime +30 -name err\* -print0 | xargs -0 rm -rf

1 0

Francois Gouget : winetest: Provide setup instructions and a sample Apache configuration.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: tools Branch: master Commit: ae0c50e351ed28e9e46deb158ca0b4b0be94e7e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ae0c50e351ed28e9e46deb15… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 10 17:11:13 2017 +0100 winetest: Provide setup instructions and a sample Apache configuration. There are probably many ways to set things up. Document at least one (hopefully a reasonable one). Note that there are still some undocumented areas Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/INSTALL.txt | 122 +++++++++++++++++++++++++++++++++++++++++++ winetest/README | 33 ------------ winetest/vhost_winetest.conf | 42 +++++++++++++++ 3 files changed, 164 insertions(+), 33 deletions(-) diff --git a/winetest/INSTALL.txt b/winetest/INSTALL.txt new file mode 100644 index 0000000..a0bf6de --- /dev/null +++ b/winetest/INSTALL.txt @@ -0,0 +1,122 @@ +1. Purpose +---------- + +This machinery is for receiving and analysing the reports resulting +from running Wine's test suite (see programs/winetest in Wine's +source). The WineTest program is a single-executable version of all the +DLL conformance test programs suitable for unattended testing and +report submitting. This package provides the destination for that and +presents the results in an ordered form. + + +2. Dependencies +--------------- + +- Apache2 with mod_perl and mod_rewrite + + +3. Web server setup +------------------- + +The goal of the proposed web server configuration below is to ensure +than any CGI script is read-only and that any writable location is +non-executable. + +Read-only source code account: +- Create a new user called 'wine' and log in as that user. +- You will need an up-to-date Wine repository somewhere. Note that this + can be a bare repository and that this site only need read-only + access to it. For instance: + git clone --bare git://source.winehq.org/git/wine.git +- Clone Wine's tools repository to $HOME/tools (so this document + should be available as $HOME/tools/winetest/INSTALL.txt). + git clone git://source.winehq.org/git/tools.git +- Edit $HOME/tools/winetest/winetest.conf to set: + $root = "/home/winehq/sites/winetest" + $gitdir = "/home/wine/wine.git"; + +Web site account: +- Create a new user called 'winehq' and log in as that user. +- Assuming all Wine's websites are placed in $HOME/sites, create the + $HOME/sites/winetest directory: + mkdir -p $HOME/sites/winetest +- Then create symbolic links to the web site's scripts: + cd $HOME/sites/winetest + ln -s /home/wine/tools/winetest/report.css + ln -s /home/wine/tools/winetest/resultform.html + ln -s /home/wine/tools/winetest/summary.css + ln -s /home/wine/tools/winetest/summary.js + ln -s /home/wine/tools/winetest/winetest.cgi +- Create the queue directory and make it writable by the web server + (i.e. replace wwwrun by the user your web server runs under): + mkdir queue + chmod g+w queue + sudo chown wwwrun queue + +Apache setup: +- Create a new virtual host, use vhost_winetest.conf as a template. +- On Debian you may have to install libapache2-mod-perl2 and create a + perl.load symbolic link in /etc/apache2/mods-enabled. +- On Debian you may also need to create a rewrite.load symbolic link in + /etc/apache2/mods-enabled. + +FIXME Access to the /builds/ and /old-data/ URLs may not work. + +FIXME The purpose of error.cgi is unclear. + It looks like accessing the /error/ URL will send the WineTest + report to the wine-tests-results mailing list instead of adding + it to the site. However that mailing list has mostly been used + for the buildbot and has not seen meaningful traffic since + 2012/04. + +FIXME The purpose of service.cgi is unclear. + It looks like it's meant to allow people to 'upload' WineTest-like + binaries to the web site. However I believe nowadays the site is + supposed to build its own test binaries. + +FIXME The site script looks like it's meant to redirect from / to + /data/ where the latter contains the real content of the website. + However this seems redundant with the ModRewrite rules in the + sample Apache configuration file. + + +4. Cron job +----------- + +The web site is essentially composed of static web pages that are +refreshed by perl scripts that are run at regular intervals. + +The script that orchestrates this is winetest.cron and it needs to be +modified so it knows where the tools and workdir directories are +located. Typically this would be: + + tools=/home/wine/tools/winetest + workdir=/home/winehq/sites/winetest + +Then set up a cron job in the winehq account to periodically update +the pages: + + */5 * * * * /home/wine/tools/winetest/winetest.cron + +Still in the winehq account, you should run winetest.cron at least once +before accessing the web site so the initial set of web pages has been +created. + + +3. Building WineTest.exe +------------------------ + +make-winetest is the script that builds the official WineTest.exe +binaries. + +FIXME Document how to set it up. Run it in yet another account since it + runs outside code? Link /home/winehq/site/winetest/builds to that + other account's build directory? Note that winetest.cron will + still need write access to it to remove old builds. + + +5. Testing +---------- + +You can manually upload WineTest reports by accessing the following URL: +http://test.example.com/submit diff --git a/winetest/README b/winetest/README deleted file mode 100644 index 68e185a..0000000 --- a/winetest/README +++ /dev/null @@ -1,33 +0,0 @@ - Wine Conformance Tests -- report processing suite - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Dear webmaster, - -This machinery is for receiving and analysing the reports resulting -from running programs/winetest. The winetest program is a single- -executable version of all the DLL conformance test programs suitable -for unattended testing and report submitting. This package provides -the destination for that and presents the results in an ordered form. - -* winetest.conf - -Configuration file, sets the following variables: -$queuedir - queue incoming submissions here -$datadir - processed data is served from here - -* winetest.cgi - -A CGI script, which receives uploads from winetest and provides manual -uploading facility. Asks the CGI.pm module to create its temporary -file in $queuedir, then renames it to repXXXXX/report. - -* winetest.cron - -Sample crontab entry illustrating the intended use of the tools. - -* summary.css, summary.js, resultform.html - -These files are referenced by the index.html files created by gather. - - -Ferenc Wagner <wferi(a)afavant.elte.hu>, Wed, 18 Jan 2004 18:18:05 +0100 diff --git a/winetest/vhost_winetest.conf b/winetest/vhost_winetest.conf new file mode 100644 index 0000000..797aac3 --- /dev/null +++ b/winetest/vhost_winetest.conf @@ -0,0 +1,42 @@ +<VirtualHost *:80> + DocumentRoot /home/winehq/sites/winetest + + ServerName winetest.example.com + ServerAdmin winetest(a)example.com + + # Contains the WineTest binaries + Alias /builds /home/winehq/sites/winetest/builds + + # A form for manually submitting test results + Alias /submit /home/winehq/sites/winetest/winetest.cgi + + PerlOptions +Parent + PerlSwitches -w + <Perl> + use strict; + BEGIN + { + unshift @INC, "/home/wine/tools/winetest"; + } + </Perl> + + <Directory /home/winehq/sites/winetest> + LimitRequestBody 2097152 + + AddHandler perl-script .cgi + PerlResponseHandler ModPerl::Registry + PerlOptions +ParseHeaders + Options +ExecCGI + + # The main index page is in /data + RewriteEngine On + RewriteRule "^$" "/data/" [R] + + # Access control the Apache 2.2 way + Order allow,deny + Allow from all + # And the Apache 2.4 way + Require all granted + </Directory> + +</VirtualHost>

1 0

Dmitry Timoshkov : kernel32: Replace Peb-> BeingDebugged check by CheckRemoteDebuggerPresent().
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 8de06f12dd267cd56284c4f307852486e867b229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de06f12dd267cd56284c4f30… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 10 17:21:32 2017 +0100 kernel32: Replace Peb->BeingDebugged check by CheckRemoteDebuggerPresent(). misctool.dll from AmiBroker intentionally sets PEB->BeingDebugged to a random value returned by RDTSC instruction on PROCESS_ATTACH. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 6 +++++- include/winbase.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0cb3d9b..70c38eb 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1085,6 +1085,7 @@ static inline DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry ) */ static DWORD WINAPI start_process( LPTHREAD_START_ROUTINE entry ) { + BOOL being_debugged; PEB *peb = NtCurrentTeb()->Peb; if (!entry) @@ -1098,8 +1099,11 @@ static DWORD WINAPI start_process( LPTHREAD_START_ROUTINE entry ) DPRINTF( "%04x:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(), debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); + if (!CheckRemoteDebuggerPresent( GetCurrentProcess(), &being_debugged )) + being_debugged = FALSE; + SetLastError( 0 ); /* clear error code */ - if (peb->BeingDebugged) DbgBreakPoint(); + if (being_debugged) DbgBreakPoint(); return call_process_entry( peb, entry ); } diff --git a/include/winbase.h b/include/winbase.h index 84cda0f..b07d4df 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1737,6 +1737,7 @@ WINBASEAPI BOOL WINAPI CancelTimerQueueTimer(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI CancelWaitableTimer(HANDLE); WINBASEAPI BOOL WINAPI CheckNameLegalDOS8Dot3A(const char*,char*,DWORD,BOOL*,BOOL*); WINBASEAPI BOOL WINAPI CheckNameLegalDOS8Dot3W(const WCHAR*, char*,DWORD,BOOL*,BOOL*); +WINBASEAPI BOOL WINAPI CheckRemoteDebuggerPresent(HANDLE,BOOL*); WINBASEAPI BOOL WINAPI ChangeTimerQueueTimer(HANDLE,HANDLE,ULONG,ULONG); WINADVAPI BOOL WINAPI CheckTokenMembership(HANDLE,PSID,PBOOL); WINBASEAPI BOOL WINAPI ClearCommBreak(HANDLE);

1 0

Jonathan Doron : ntdll: Define more file information classes.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 9c72376c8cc03a4ea86dddaa6d18a93a1a33fc73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c72376c8cc03a4ea86dddaa6… Author: Jonathan Doron <jond(a)wizery.com> Date: Tue Feb 7 17:11:00 2017 +0200 ntdll: Define more file information classes. Signed-off-by: Jonathan Doron <jond(a)wizery.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 7 +++++++ dlls/ntdll/tests/directory.c | 2 ++ include/winternl.h | 7 +++++++ 3 files changed, 16 insertions(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index c7669ee..a6c1098 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2374,7 +2374,14 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, 0, /* FileNumaNodeInformation */ 0, /* FileStandardLinkInformation */ 0, /* FileRemoteProtocolInformation */ + 0, /* FileRenameInformationBypassAccessCheck */ + 0, /* FileLinkInformationBypassAccessCheck */ + 0, /* FileVolumeNameInformation */ + 0, /* FileIdInformation */ + 0, /* FileIdExtdDirectoryInformation */ 0, /* FileReplaceCompletionInformation */ + 0, /* FileHardLinkFullIdInformation */ + 0, /* FileIdExtdBothDirectoryInformation */ }; struct stat st; diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index d39b488..d21ac45 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -353,6 +353,8 @@ static void test_NtQueryDirectoryFile_classes( HANDLE handle, UNICODE_STRING *ma switch (class) { case FileIdGlobalTxDirectoryInformation: + case FileIdExtdDirectoryInformation: + case FileIdExtdBothDirectoryInformation: if (status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED) continue; /* fall through */ case FileDirectoryInformation: diff --git a/include/winternl.h b/include/winternl.h index f35091c..891b6a7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -441,7 +441,14 @@ typedef enum _FILE_INFORMATION_CLASS { FileNumaNodeInformation, FileStandardLinkInformation, FileRemoteProtocolInformation, + FileRenameInformationBypassAccessCheck, + FileLinkInformationBypassAccessCheck, + FileVolumeNameInformation, + FileIdInformation, + FileIdExtdDirectoryInformation, FileReplaceCompletionInformation, + FileHardLinkFullIdInformation, + FileIdExtdBothDirectoryInformation, FileMaximumInformation } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS;

1 0

Henri Verbeet : ddraw: Implement GetSurfaceFromDC().
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: ebcf5196fc150b6ed4bf4891d3f5b0ebe08d625c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebcf5196fc150b6ed4bf4891d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 10 13:58:58 2017 +0100 ddraw: Implement GetSurfaceFromDC(). Many thanks to Dmitry Timoshkov for helping figure this out. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.spec | 2 +- dlls/ddraw/main.c | 34 ++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 41 +++++++++++++++++++++++++++++++++++++++-- 4 files changed, 112 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.spec b/dlls/ddraw/ddraw.spec index 7575091..a6cf141 100644 --- a/dlls/ddraw/ddraw.spec +++ b/dlls/ddraw/ddraw.spec @@ -15,7 +15,7 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub GetNextMipMap -@ stub GetSurfaceFromDC +@ stdcall GetSurfaceFromDC(ptr ptr ptr) @ stub HeapVidMemAllocAligned @ stub InternalLock @ stub InternalUnlock diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 4c94dd1..4caa923 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -200,6 +200,40 @@ void *ddraw_get_object(struct ddraw_handle_table *t, DWORD handle, enum ddraw_ha return entry->object; } +HRESULT WINAPI GetSurfaceFromDC(HDC dc, IDirectDrawSurface4 **surface, HDC *device_dc) +{ + struct ddraw *ddraw; + + TRACE("dc %p, surface %p, device_dc %p.\n", dc, surface, device_dc); + + if (!surface) + return E_INVALIDARG; + + if (!device_dc) + { + *surface = NULL; + + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(ddraw, &global_ddraw_list, struct ddraw, ddraw_list_entry) + { + if (FAILED(IDirectDraw4_GetSurfaceFromDC(&ddraw->IDirectDraw4_iface, dc, surface))) + continue; + + *device_dc = NULL; /* FIXME */ + wined3d_mutex_unlock(); + return DD_OK; + } + wined3d_mutex_unlock(); + + *surface = NULL; + *device_dc = NULL; + + return DDERR_NOTFOUND; +} + /*********************************************************************** * * Helper function for DirectDrawCreate and friends diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d5b43f4..830da89 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -24,6 +24,8 @@ #include <math.h> #include "d3d.h" +HRESULT WINAPI GetSurfaceFromDC(HDC dc, struct IDirectDrawSurface **surface, HDC *device_dc); + static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); static DEVMODEW registry_mode; @@ -12778,10 +12780,11 @@ static void test_get_surface_from_dc(void) IDirectDrawSurface4 *surface; DDSURFACEDESC2 surface_desc; IDirectDraw4 *ddraw; + HDC dc, device_dc; ULONG refcount; HWND window; HRESULT hr; - HDC dc; + DWORD ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -12810,6 +12813,33 @@ static void test_get_surface_from_dc(void) hr = IDirectDrawSurface4_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + tmp = (void *)0xdeadbeef; + device_dc = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(NULL, &tmp, &device_dc); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!tmp, "Got unexpected surface %p.\n", tmp); + ok(!device_dc, "Got unexpected device_dc %p.\n", device_dc); + + device_dc = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(dc, NULL, &device_dc); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(device_dc == (void *)0xdeadbeef, "Got unexpected device_dc %p.\n", device_dc); + + tmp = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(dc, &tmp, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!tmp, "Got unexpected surface %p.\n", tmp); + + hr = GetSurfaceFromDC(dc, &tmp, &device_dc); + ok(SUCCEEDED(hr), "GetSurfaceFromDC failed, hr %#x.\n", hr); + ok(tmp == surface1, "Got unexpected surface %p, expected %p.\n", tmp, surface1); + IDirectDrawSurface_Release(tmp); + + ret = GetObjectType(device_dc); + todo_wine ok(ret == OBJ_DC, "Got unexpected object type %#x.\n", ret); + ret = GetDeviceCaps(device_dc, TECHNOLOGY); + todo_wine ok(ret == DT_RASDISPLAY, "Got unexpected technology %#x.\n", ret); + hr = IDirectDraw4_GetSurfaceFromDC(ddraw, dc, NULL); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); @@ -12831,6 +12861,13 @@ static void test_get_surface_from_dc(void) ok(!!dc, "CreateCompatibleDC failed.\n"); tmp = (void *)0xdeadbeef; + device_dc = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(dc, &tmp, &device_dc); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!tmp, "Got unexpected surface %p.\n", tmp); + ok(!device_dc, "Got unexpected device_dc %p.\n", device_dc); + + tmp = (void *)0xdeadbeef; hr = IDirectDraw4_GetSurfaceFromDC(ddraw, dc, (IDirectDrawSurface4 **)&tmp); ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); ok(!tmp, "Got unexpected surface %p.\n", tmp); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 70aff8f..31e7640 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -24,6 +24,8 @@ #include <math.h> #include "d3d.h" +HRESULT WINAPI GetSurfaceFromDC(HDC dc, struct IDirectDrawSurface **surface, HDC *device_dc); + static HRESULT (WINAPI *pDirectDrawCreateEx)(GUID *guid, void **ddraw, REFIID iid, IUnknown *outer_unknown); static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); static DEVMODEW registry_mode; @@ -12447,14 +12449,15 @@ static void test_surface_desc_size(void) static void test_get_surface_from_dc(void) { + IDirectDrawSurface *surface1, *tmp1; IDirectDrawSurface7 *surface, *tmp; - IDirectDrawSurface *surface1; DDSURFACEDESC2 surface_desc; IDirectDraw7 *ddraw; + HDC dc, device_dc; ULONG refcount; HWND window; HRESULT hr; - HDC dc; + DWORD ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -12483,6 +12486,33 @@ static void test_get_surface_from_dc(void) hr = IDirectDrawSurface7_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + tmp1 = (void *)0xdeadbeef; + device_dc = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(NULL, &tmp1, &device_dc); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!tmp1, "Got unexpected surface %p.\n", tmp1); + ok(!device_dc, "Got unexpected device_dc %p.\n", device_dc); + + device_dc = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(dc, NULL, &device_dc); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(device_dc == (void *)0xdeadbeef, "Got unexpected device_dc %p.\n", device_dc); + + tmp1 = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(dc, &tmp1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!tmp1, "Got unexpected surface %p.\n", tmp1); + + hr = GetSurfaceFromDC(dc, &tmp1, &device_dc); + ok(SUCCEEDED(hr), "GetSurfaceFromDC failed, hr %#x.\n", hr); + ok(tmp1 == surface1, "Got unexpected surface %p, expected %p.\n", tmp1, surface1); + IDirectDrawSurface_Release(tmp1); + + ret = GetObjectType(device_dc); + todo_wine ok(ret == OBJ_DC, "Got unexpected object type %#x.\n", ret); + ret = GetDeviceCaps(device_dc, TECHNOLOGY); + todo_wine ok(ret == DT_RASDISPLAY, "Got unexpected technology %#x.\n", ret); + hr = IDirectDraw7_GetSurfaceFromDC(ddraw, dc, NULL); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); @@ -12503,6 +12533,13 @@ static void test_get_surface_from_dc(void) dc = CreateCompatibleDC(NULL); ok(!!dc, "CreateCompatibleDC failed.\n"); + tmp1 = (void *)0xdeadbeef; + device_dc = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(dc, &tmp1, &device_dc); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!tmp1, "Got unexpected surface %p.\n", tmp1); + ok(!device_dc, "Got unexpected device_dc %p.\n", device_dc); + tmp = (void *)0xdeadbeef; hr = IDirectDraw7_GetSurfaceFromDC(ddraw, dc, &tmp); ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr);

1 0

Henri Verbeet : wined3d: Disable sRGB decode in swapchain_blit().
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 1401f91307b6cd70f77be7a8407574d0f541d11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1401f91307b6cd70f77be7a84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 10 13:58:59 2017 +0100 wined3d: Disable sRGB decode in swapchain_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 56646e7..dfb62c8 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -387,6 +387,9 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, device->blitter->set_shader(device->blit_priv, context2, back_buffer, NULL); gl_info->gl_ops.gl.p_glTexParameteri(back_buffer->texture_target, GL_TEXTURE_MIN_FILTER, gl_filter); gl_info->gl_ops.gl.p_glTexParameteri(back_buffer->texture_target, GL_TEXTURE_MAG_FILTER, gl_filter); + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + gl_info->gl_ops.gl.p_glTexParameteri(back_buffer->texture_target, + GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); context_set_draw_buffer(context, GL_BACK);

1 0

Francois Gouget : winetest: There is no special directory anymore.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 8e14f1f79a157028ccb332f1aea5b2b5f8885869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e14f1f79a157028ccb332f1a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 10 16:39:32 2017 +0100 winetest: There is no special directory anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 48b71c5..3b2342a 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -514,11 +514,8 @@ static void remove_dir (const char *dir) static const char* get_test_source_file(const char* test, const char* subtest) { - static const char* special_dirs[][2] = { - { 0, 0 } - }; static char buffer[MAX_PATH]; - int i, len = strlen(test); + int len = strlen(test); if (len > 4 && !strcmp( test + len - 4, ".exe" )) { @@ -527,14 +524,6 @@ static const char* get_test_source_file(const char* test, const char* subtest) } else len = sprintf(buffer, "dlls/%s", test); - for (i = 0; special_dirs[i][0]; i++) { - if (strcmp(test, special_dirs[i][0]) == 0) { - strcpy( buffer, special_dirs[i][1] ); - len = strlen(buffer); - break; - } - } - sprintf(buffer + len, "/tests/%s.c", subtest); return buffer; }

1 0

Francois Gouget : winetest: Explain why the source filename is printed.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 548b650e8a4c389ede63b28fd9d4875602439104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=548b650e8a4c389ede63b28fd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 10 16:40:18 2017 +0100 winetest: Explain why the source filename is printed. It is used by analysis tools like test.winehq.org to link to the relevant test source file. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 3b2342a..4d1fa28 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -773,6 +773,7 @@ get_subtests (const char *tempdir, struct wine_test *test, LPSTR res_name) static void run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const char *tempdir) { + /* Build the source filename so analysis tools can link to it */ const char* file = get_test_source_file(test->name, subtest); if (test_filtered_out( test->name, subtest ))

1 0

Francois Gouget : wininet/tests: A spelling fix in an ok() message.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 8f669b63a6848cb348301577ea75edc3428e4877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f669b63a6848cb348301577e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 10 16:40:43 2017 +0100 wininet/tests: A spelling fix in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 5408af8..9b32117 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1187,7 +1187,7 @@ static void test_end_browser_session(void) ok(len != 0, "len = 0\n"); ret = InternetSetOptionA(NULL, INTERNET_OPTION_END_BROWSER_SESSION, NULL, 0); - ok(ret, "InternetSetOptio(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); + ok(ret, "InternetSetOption(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); len = 1024; ret = InternetGetCookieA("http://www.example.com/test_end", NULL, NULL, &len);

1 0