February 2014 - Wine-commits

Dmitry Timoshkov : xmllite/tests: Add a test for short variant of xml declaration.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: b02ea57e043c4ddac7a396ae5eaa52caeb6eaa9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b02ea57e043c4ddac7a396ae5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 10 12:44:52 2014 +0900 xmllite/tests: Add a test for short variant of xml declaration. --- dlls/xmllite/tests/reader.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index b7ef862..f4ad466 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -55,6 +55,7 @@ static void free_str(WCHAR *str) } static const char xmldecl_full[] = "\xef\xbb\xbf<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; +static const char xmldecl_short[] = "<?xml version=\"1.0\"?>\n"; static IStream *create_stream_on_data(const char *data, int size) { @@ -750,6 +751,42 @@ todo_wine { ok(type == XmlNodeType_None, "got %d\n", type); } IStream_Release(stream); + + /* test short variant */ + stream = create_stream_on_data(xmldecl_short, sizeof(xmldecl_short)); + + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + + type = -1; + hr = IXmlReader_Read(reader, &type); +todo_wine + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); +todo_wine + ok(type == XmlNodeType_XmlDeclaration, "expected XmlDeclaration, got %s\n", type_to_str(type)); + ok_pos(reader, 1, 3, 1, 21, TRUE); + test_read_state(reader, XmlReadState_Interactive, -1, TRUE); + + hr = IXmlReader_GetValue(reader, &val, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); +todo_wine + ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); + + /* check attributes */ + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + + type = -1; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(type == XmlNodeType_Attribute, "got %d\n", type); + ok_pos(reader, 1, 7, 1, 21, TRUE); + + /* try to move from last attribute */ + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_FALSE, "expected S_FALSE, got %08x\n", hr); + + IStream_Release(stream); IXmlReader_Release(reader); }

1 0

Dmitry Timoshkov : cabinet/tests: Advance buffer by actually read bytes count.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 65562be420fd8f76a2ca6e9e1ad6ae0511d0801f URL: http://source.winehq.org/git/wine.git/?a=commit;h=65562be420fd8f76a2ca6e9e1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 10 15:10:29 2014 +0900 cabinet/tests: Advance buffer by actually read bytes count. --- dlls/cabinet/tests/fdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index afae707..4ed967a 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -721,7 +721,7 @@ static UINT CDECL fdi_mem_read(INT_PTR hf, void *pv, UINT cb) cb_read = (available >= cb) ? cb : available; memcpy(pv, data->base + data->pos, cb_read); - data->pos += cb; + data->pos += cb_read; /*trace("mem_read(%p,%p,%u) => %u\n", hf, pv, cb, cb_read);*/ return cb_read;

1 0

Dmitry Timoshkov : advapi32/tests: Add a test for page to access mapping performed by CreateFileMapping.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 162c2b7aa0cc1efccdb5f0686498e66bd1c9aed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=162c2b7aa0cc1efccdb5f0686… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 7 12:43:13 2014 +0900 advapi32/tests: Add a test for page to access mapping performed by CreateFileMapping. --- dlls/advapi32/tests/security.c | 75 ++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f3cc85d..ac98b49 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4901,8 +4901,10 @@ todo_wine static void test_filemap_security(void) { + char temp_path[MAX_PATH]; + char file_name[MAX_PATH]; DWORD ret, i, access; - HANDLE mapping, dup; + HANDLE file, mapping, dup; static const struct { int generic, mapped; @@ -4914,27 +4916,70 @@ static void test_filemap_security(void) { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SECTION_MAP_EXECUTE }, { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS } }; + static const struct + { + int prot, mapped; + } prot_map[] = + { + { 0, 0 }, + { PAGE_NOACCESS, 0 }, + { PAGE_READONLY, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ }, + { PAGE_READWRITE, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE }, + { PAGE_WRITECOPY, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ }, + { PAGE_EXECUTE, 0 }, + { PAGE_EXECUTE_READ, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE }, + { PAGE_EXECUTE_READWRITE, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE }, + { PAGE_EXECUTE_WRITECOPY, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE } + }; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "tmp", 0, file_name); SetLastError(0xdeadbeef); - mapping = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_EXECUTE_READWRITE, 0, 4096, NULL); - if (mapping) - { - access = get_obj_access(mapping); -todo_wine - ok(access == (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE), - "expected STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE, got %#x\n", access); - } - else /* win2k fails to create EXECUTE mapping using system page file */ + file = CreateFileA(file_name, GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + SetFilePointer(file, 4096, NULL, FILE_BEGIN); + SetEndOfFile(file); + + for (i = 0; i < sizeof(prot_map)/sizeof(prot_map[0]); i++) { SetLastError(0xdeadbeef); - mapping = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, NULL); - ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); + mapping = CreateFileMappingW(file, NULL, prot_map[i].prot, 0, 4096, NULL); + if (prot_map[i].mapped) + { + if (!mapping) + { + if (prot_map[i].prot == PAGE_EXECUTE_READ || prot_map[i].prot == PAGE_EXECUTE_READWRITE || prot_map[i].prot == PAGE_EXECUTE_WRITECOPY) + { + win_skip("CreateFileMapping doesn't support PAGE_EXECUTE protection\n"); + continue; + } + } + ok(mapping != 0, "CreateFileMapping(%04x) error %d\n", prot_map[i].prot, GetLastError()); + } + else + { + ok(!mapping, "CreateFileMapping(%04x) error %d\n", prot_map[i].prot, GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + continue; + } access = get_obj_access(mapping); - ok(access == (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE), - "expected STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE, got %#x\n", access); +todo_wine + ok(access == prot_map[i].mapped, "%d: expected %#x, got %#x\n", i, prot_map[i].mapped, access); + + CloseHandle(mapping); } + SetLastError(0xdeadbeef); + mapping = CreateFileMappingW(file, NULL, PAGE_EXECUTE_READWRITE, 0, 4096, NULL); + ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); + + access = get_obj_access(mapping); +todo_wine + ok(access == (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE), + "expected STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE, got %#x\n", access); + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) { SetLastError( 0xdeadbeef ); @@ -4949,6 +4994,8 @@ todo_wine } CloseHandle(mapping); + CloseHandle(file); + DeleteFileA(file_name); } static void test_thread_security(void)

1 0

Andrey Gusev : Ukrainian translation for release 1.7.12
by Jeremy Newman 10 Feb '14

10 Feb '14

Module: website Branch: master Commit: 5e3c77254b33596f28997d21ce70d88506ba238d URL: http://source.winehq.org/git/website.git/?a=commit;h=5e3c77254b33596f28997d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Feb 8 01:17:21 2014 +0200 Ukrainian translation for release 1.7.12 --- news/uk/2014020701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/uk/2014020701.xml b/news/uk/2014020701.xml new file mode 100644 index 0000000..c57966f --- /dev/null +++ b/news/uk/2014020701.xml @@ -0,0 +1,16 @@ +<news> +<date>7 лютого 2014</date> +<title>Випущено Wine 1.7.12</title> +<body> + Розробницький реліз Wine 1.7.12 наразі доступний. + <a href="{$root}/announce/1.7.12">Що нового</a> в цьому релізі: +<ul> + <li>Початкова підтримка інтерфейсів Windows Media Player.</li> + <li>Дещо збільшено підтримку планувальника завдань.</li> + <li>Різні виправлення виконання C++.</li> + <li>Більше бібліотек з неподобними іменами для підтримки Windows 8 API.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.12.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.12
by Jeremy Newman 07 Feb '14

07 Feb '14

Module: website Branch: master Commit: 9cdd8fc2ebe9179171c8e83fe4a888d46db5fca7 URL: http://source.winehq.org/git/website.git/?a=commit;h=9cdd8fc2ebe9179171c8e8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 7 22:24:42 2014 +0100 French translation for release 1.7.12 --- news/fr/2014020701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014020701.xml b/news/fr/2014020701.xml new file mode 100644 index 0000000..8cacd86 --- /dev/null +++ b/news/fr/2014020701.xml @@ -0,0 +1,15 @@ +<news> +<date>7 février 2014</date> +<title>Sortie de Wine 1.7.12</title> +<body> + La version de développement 1.7.12 de Wine est disponible. + <a href="{$root}/announce/1.7.12">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge initiale des interfaces de Windows Media Player.</li> + <li>Améliorations dans le planificateur de tâches.</li> + <li>Divers correctifs dans les moteurs d'exécution C++.</li> + <li>Quelques DLL de plus avec des noms abominables pour la prise en charge des jeux d'API de Windows 8.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.12.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.7.12 freigegeben
by Jeremy Newman 07 Feb '14

07 Feb '14

Module: website Branch: master Commit: bf367c610eaaf52d9d7e1a6853ba0495f505577b URL: http://source.winehq.org/git/website.git/?a=commit;h=bf367c610eaaf52d9d7e1a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 7 21:19:17 2014 +0100 Wine 1.7.12 freigegeben --- news/de/2014020701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014020701.xml b/news/de/2014020701.xml new file mode 100644 index 0000000..12d800d --- /dev/null +++ b/news/de/2014020701.xml @@ -0,0 +1,16 @@ +<news> +<date>7. Februar 2014</date> +<title>Wine 1.7.12 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.12 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.12">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Anfängliche Unterstützung der Window Media Player Schnittstellen.</li> + <li>Verbessere Task Scheduler Unterstützung.</li> + <li>Verschiedene C++ Laufzeit Fehlerbehebungen.</li> + <li>Mehr Dlls mit hässlichen Namen für Windows 8 API Unterstützung.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.12.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.12
by Alexandre Julliard 07 Feb '14

07 Feb '14

Module: website Branch: master Commit: 14ca1bc06c384e1a3c2d51b3205a7e1e54045519 URL: http://source.winehq.org/git/website.git/?a=commit;h=14ca1bc06c384e1a3c2d51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 20:04:34 2014 +0100 Wine release 1.7.12 --- news/en/2014020701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014020701.xml b/news/en/2014020701.xml new file mode 100644 index 0000000..ce004de --- /dev/null +++ b/news/en/2014020701.xml @@ -0,0 +1,16 @@ +<news> +<date>February 7, 2014</date> +<title>Wine 1.7.12 Released</title> +<body> + The Wine development release 1.7.12 is now available. + <a href="{$root}/announce/1.7.12">What's new</a> in this release: +<ul> + <li>Initial support for Window Media Player interfaces.</li> + <li>Some more Task Scheduler support.</li> + <li>Various C++ runtime fixes.</li> + <li>More dlls with ugly names for Windows 8 API set support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.12.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.7.12.
by Alexandre Julliard 07 Feb '14

07 Feb '14

Module: wine Branch: master Commit: 24109dc6978c91c1c87e56f4c5f9e972bb5d422c URL: http://source.winehq.org/git/wine.git/?a=commit;h=24109dc6978c91c1c87e56f4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 19:57:00 2014 +0100 Release 1.7.12. --- ANNOUNCE | 912 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 476 insertions(+), 456 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24109dc6978c91c1c87e5…

1 0

Tag wine-1.7.12 : Alexandre Julliard : Release 1.7.12
by Alexandre Julliard 07 Feb '14

07 Feb '14

Module: wine Branch: refs/tags/wine-1.7.12 Tag: 1525e4ca59242bbee2a6628b892cd051f3816d2e URL: http://source.winehq.org/git/wine.git/?a=tag;h=1525e4ca59242bbee2a6628b892c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 19:57:00 2014 +0100 Release 1.7.12

1 0

Michael Stefaniuc : winetest: Reject test runs from NT3 and NT4 versions.
by Alexandre Julliard 07 Feb '14

07 Feb '14

Module: tools Branch: master Commit: 0cbab747e7aed09af9e32d5d7a41b16b69881a72 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0cbab747e7aed09af9e32d5d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 5 22:33:56 2014 +0100 winetest: Reject test runs from NT3 and NT4 versions. --- winetest/dissect | 10 ++++++++-- winetest/winetest.conf | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index fe80a44..9081a94 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -33,7 +33,7 @@ use open ':utf8'; use CGI qw(:standard); charset("utf-8"); -use vars qw/$gitdir $gitweb $queuedir $datadir $maxmult $maxuserskips $maxfilesize $acceptwin9x/; +use vars qw/$gitdir $gitweb $queuedir $datadir $maxmult $maxuserskips $maxfilesize $acceptprediluvianwin/; require "winetest.conf"; my $name0=$0; @@ -154,7 +154,8 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { } $box->{data} .= "</table>\n"; -if ($plid != 2) { mydie "platform $plid not accepted\n" unless $acceptwin9x; } +my $prediluvian = 0; +if ($plid != 2) { $prediluvian = 1; } $version = "unknown"; if ($plid==1 && $major==4) { @@ -168,8 +169,10 @@ if ($plid==1 && $major==4) { } elsif ($plid==2) { if ($major==3 && $minor==51) { $version = "nt3"; + $prediluvian = 1; } elsif ($major==4 && $minor== 0) { $version = "nt4"; + $prediluvian = 1; } elsif ($major==5) { if ($minor==0) { $version = "2000"; @@ -202,6 +205,9 @@ if ($plid==1 && $major==4) { } elsif ($plid==3) { #$version = "ce$major$minor"; } + +if ($prediluvian and not $acceptprediluvianwin) { mydie "platform $version not accepted\n"; } + if ($wine) { my %known_hosts = ( "Linux" => "linux", "Darwin" => "mac", diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 19104d8..40b3e50 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -14,8 +14,8 @@ $maxmult = 10; # Maximum allowed number of explicit user skips $maxuserskips = 10; -# Whether to accept test results from Win9x versions -$acceptwin9x = 0; +# Whether to accept test results from Win9x / NT4 versions +$acceptprediluvianwin = 0; # Maximum size of the report file # This should be in line with programs\winetest\send.c

1 0