March 2016 - Wine-Commits - list.winehq.org

Alexandre Julliard : Remove no longer used documentation scripts.
by Alexandre Julliard March 18, 2016

March 18, 2016

Module: tools Branch: master Commit: cf493350661fbd366a7e220779982668449c6fc3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cf493350661fbd366a7e2207… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 14:12:27 2016 +0900 Remove no longer used documentation scripts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winedoc.css | 10 ------ winedocs.cron | 64 --------------------------------- winehtml.dsl | 27 -------------- wineprint.dsl | 111 ---------------------------------------------------------- 4 files changed, 212 deletions(-) diff --git a/winedoc.css b/winedoc.css deleted file mode 100644 index f93abba..0000000 --- a/winedoc.css +++ /dev/null @@ -1,10 +0,0 @@ -body { background-color: #FFFFFF; color: #000000; } - -a:link { color: #a50d0d; } -a:visited { color: #505050; } -a:active { color: #a50d0d; } - -.screen { background-color: #E0D0D0; padding: 0.5ex; } -.question { border-top: dashed thin; font-weight: bolder; } - -.userinput { font-weight: bold; } diff --git a/winedocs.cron b/winedocs.cron deleted file mode 100755 index 472a087..0000000 --- a/winedocs.cron +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# -# This script updates the documentation on the website if necessary. -# It should be run periodically from cron. -# - -set -e -umask 002 - -cd /home/winehq/opt/wine-docs -git fetch >/dev/null 2>&1 - -# check if anything has changed -if [ "$(git rev-parse HEAD)" = "$(git rev-parse origin/master)" ] -then - exit 0 # nothing to do -fi - -rm -f lastbuild.log -exec >lastbuild.log 2>&1 - -git reset --hard origin/master - -echo "==== BUILDING SGML DOCUMENTATION ====" - -books="wineusr-guide winedev-guide winelib-guide" -langs="en" -site_base_dir="/home/winehq/opt/website" -tools_dir="/home/winehq/opt/git-tools" -git_dir="/home/winehq/opt/source/git" -guides_base_dir="$site_base_dir/docs" -winehq_base_dir="$site_base_dir/templates" - -for lang in $langs -do - [ -d $guides_base_dir/$lang ] || mkdir $guides_base_dir/$lang - [ -d $winehq_base_dir/$lang/docs ] || mkdir $winehq_base_dir/$lang/docs - rm -f $guides_base_dir/$lang/winedoc.css && cp $tools_dir/winedoc.css $guides_base_dir/$lang - - cd $lang - for book in $books - do - echo "* $book" - - # build guides as single files - docbook2html -u -d $tools_dir/winehtml.dsl $book.sgml - docbook2pdf -d $tools_dir/wineprint.dsl $book.sgml - docbook2ps -d $tools_dir/wineprint.dsl $book.sgml - mv -f $book.html $book.pdf $book.ps $guides_base_dir/$lang - - # build the online html version - docbook2html -d $tools_dir/winehtml.dsl -o $book.web $book.sgml - [ -d $winehq_base_dir/$lang/docs/$book ] || mkdir $winehq_base_dir/$lang/docs/$book - for f in $book.web/*.htm - do - outfile=`basename $f .htm`.template - $tools_dir/html2template -i $f -o $outfile && mv -f $outfile $winehq_base_dir/$lang/docs/$book/$outfile - done - rm -rf $book.web - done - cd .. -done - -# end diff --git a/winehtml.dsl b/winehtml.dsl deleted file mode 100644 index 5270a99..0000000 --- a/winehtml.dsl +++ /dev/null @@ -1,27 +0,0 @@ -<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ -<!ENTITY walsh-style PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA DSSSL> -<!ENTITY cygnus-style SYSTEM "/usr/lib/sgml/stylesheet/dsssl/docbook/cygnus/cygnus-both.dsl" CDATA DSSSL> -]> - -<style-sheet> -<style-specification id="html" use="docbook"> -<style-specification-body> - -; Use the section id as the filename rather than -; cryptic filenames like x1547.html -(define %use-id-as-filename% #t) - -; Repeat the section number in each section to make it easier -; when browsing the doc -(define %section-autolabel% #t) - -; Use CSS to make the look of the documentation customizable -(define %stylesheet% "winedoc.css") -(define %stylesheet-type% "text/css") - -</style-specification-body> -</style-specification> - -<external-specification id="docbook" document="walsh-style"> - -</style-sheet> diff --git a/wineprint.dsl b/wineprint.dsl deleted file mode 100644 index 7f53b2f..0000000 --- a/wineprint.dsl +++ /dev/null @@ -1,111 +0,0 @@ -<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ -<!ENTITY print-ss PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA DSSSL> -]> - -<style-sheet> - -<style-specification id="print" use="print-stylesheet"> -<style-specification-body> - -;; I was hoping that this would take out the many blank pages in the -;; PDF file, but it doesn't, it just slides the page numbers over. -(define %two-side% #f) - -(define %generate-book-titlepage% #t) - -;;Titlepage Not Separate -(define (chunk-skip-first-element-list) - (list (normalize "sect1") - (normalize "section"))) - -;;Titlepage Separate? -;(define (chunk-skip-first-element-list) -; '()) - -(define (list-element-list) - ;; fixes bug in Table of Contents generation - '()) - -(define (toc-depth nd) - 2) - -;; This seems to have no affect -(define %generate-book-titlepage-on-separate-page% #f) - -(define %body-start-indent% - ;; Default indent of body text - 2pi) - -(define %para-indent-firstpara% - ;; First line start-indent for the first paragraph - 0pt) - -(define %para-indent% - ;; First line start-indent for paragraphs (other than the first) - 0pt) - -(define %block-start-indent% - ;; Extra start-indent for block-elements - 2pt) - -;;Define distance between paragraphs -(define %para-sep% - (/ %bf-size% 2.0)) - -;;Define distance between block elements (figures, tables, etc.). -(define %block-sep% - (* %para-sep% 1.0)) -;; (* %para-sep% 2.0)) - -(define %hyphenation% - ;; Allow automatic hyphenation? - #t) - -(define %left-margin% 5pi) -(define %right-margin% 5pi) -(define %top-margin% 5pi) -(define %bottom-margin% 5pi) - -(define %footer-margin% 2pi) -(define %header-margin% 2pi) - -(define %line-spacing-factor% 1.3) - ;; Factor used to calculate leading - ;; The leading is calculated by multiplying the current font size by the - ;; '%line-spacing-factor%'. For example, if the font size is 10pt and - ;; the '%line-spacing-factor%' is 1.1, then the text will be - ;; printed "10-on-11". - -(define %head-before-factor% - ;; Factor used to calculate space above a title - ;; The space before a title is calculated by multiplying the font size - ;; used in the title by the '%head-before-factor%'. -;; 0.75) - 0.5) - -(define %head-after-factor% - ;; Factor used to calculate space below a title - ;; The space after a title is calculated by multiplying the font size used - ;; in the title by the '%head-after-factor%'. - 0.5) - -(define %input-whitespace-treatment% 'collapse) - -(define ($generate-book-lot-list$) - ;; Which Lists of Titles should be produced for Books? - (list )) - -(define tex-backend - ;; Are we using the TeX backend? - ;; This parameter exists so that '-V tex-backend' can be used on the - ;; command line to explicitly select the TeX backend. - #t) - -</style-specification-body> -</style-specification> - -<external-specification id="print-stylesheet" document="print-ss"> - -</style-sheet> - -

1 0

Alexandre Julliard : Rename the git-tools directory, we no longer have other tools.
by Alexandre Julliard March 18, 2016

March 18, 2016

Module: tools Branch: master Commit: 5fedd480cacc9534577b6c3013d2d9fd63e703c3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=5fedd480cacc9534577b6c30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 16:55:45 2016 +0900 Rename the git-tools directory, we no longer have other tools. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- wine_release | 2 +- winetest/winetest.cron | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wine_release b/wine_release index f28485d..aed1545 100755 --- a/wine_release +++ b/wine_release @@ -19,7 +19,7 @@ branch=${2:-master} website_dir="/home/winehq/opt/website" templates_dir=$website_dir/templates -tools_dir="/home/winehq/opt/git-tools" +tools_dir="/home/winehq/opt/tools" cd /home/winehq/opt/source diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 4349f26..42f52c8 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -17,7 +17,7 @@ # Cron job for generating winetest reports. Use it like # */5 * * * * apache winetest.cron -tools=/home/winehq/opt/git-tools/winetest +tools=/home/winehq/opt/tools/winetest workdir=/home/winehq/opt/winetest lock=/tmp/winetest.lock

1 0

Alexandre Julliard : winetest: Use mingw-w64 to build the test binaries.
by Alexandre Julliard March 18, 2016

March 18, 2016

Module: tools Branch: master Commit: bca53766e20e0dd4689559f6ab5a62c3277aff12 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bca53766e20e0dd4689559f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 14:57:14 2016 +0900 winetest: Use mingw-w64 to build the test binaries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/make-winetest | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/winetest/make-winetest b/winetest/make-winetest index 0ae85fe..638590b 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -47,11 +47,11 @@ done destdir="/home/winehq/opt/winetest/builds" desturl="http://test.winehq.org/builds" servicedir="/home/winehq/opt/winetest/winehq-builds/winetest" -toolsdir="/home/winehq/opt/git-tools" +toolsdir="/home/winehq/opt/tools" transldir="/home/winehq/opt/source/transl" -mingw32=i586-mingw32msvc -mingw64=x86_64-pc-mingw32 +mingw32=i686-w64-mingw32 +mingw64=x86_64-w64-mingw32 logfile=LOG # if the log file exists, either a build is in progress or one has failed @@ -101,20 +101,20 @@ umask 022 # then cross-compile the tests - test -d build-mingw || - (mkdir build-mingw && - cd build-mingw && + test -d build-mingw32 || + (mkdir build-mingw32 && + cd build-mingw32 && ../wine/configure --host=$mingw32 --with-wine-tools=../build-native --without-x --without-freetype) || exit - (cd build-mingw && + (cd build-mingw32 && make depend && make programs/winetest && upx -9 -qq programs/winetest/winetest.exe) || exit # install everything - chmod 644 build-mingw/programs/winetest/winetest.exe - mv -f build-mingw/programs/winetest/winetest.exe $destdir/winetest-$head.exe + chmod 644 build-mingw32/programs/winetest/winetest.exe + mv -f build-mingw32/programs/winetest/winetest.exe $destdir/winetest-$head.exe ln -sf winetest-$head.exe $destdir/winetest-latest.exe rm -f $servicedir/*.cookie $servicedir/*.url sha1sum $destdir/winetest-latest.exe | cut -c1-40 > $servicedir/winetest-$head.cookie

1 0

Alexandre Julliard : winetest: Generate a page showing the test report processing errors.
by Alexandre Julliard March 18, 2016

March 18, 2016

Module: tools Branch: master Commit: c0a56077d23f9f66f39be2f05911537b1fbcc0bd URL: http://source.winehq.org/git/tools.git/?a=commit;h=c0a56077d23f9f66f39be2f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 13:13:44 2016 +0900 winetest: Generate a page showing the test report processing errors. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index cacd05f..5f00f5d 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -23,8 +23,9 @@ use strict; use warnings; use open ':utf8'; use CGI qw(:standard); +use POSIX qw(strftime); -use vars qw/$gitdir $gitweb/; +use vars qw/$gitdir $gitweb $queuedir/; require "winetest.conf"; binmode STDIN, ':utf8'; @@ -193,9 +194,7 @@ EOF next unless defined $alltests{$test}->{$build->{name}}; printf OUT " <tr><td class=\"build\"><a href=\"../%s\" title=\"%s\">%s</a></td>\n", $build->{name}, $build->{name}, substr($build->{name},0,12); - my @date = gmtime($build->{date}); - printf OUT " <td class=\"date\">%02d %s %04d</td>", - $date[3], $months[$date[4]], $date[5] + 1900, $date[2]; + printf OUT " <td class=\"date\">%s</td>", strftime("%b %d", gmtime($build->{date})); foreach my $group (@groups) { next unless defined $used_group{$group->{name}}; @@ -243,8 +242,7 @@ print OUT "<th colspan=\"3\">Failures</th><th></th></tr></thead>\n"; foreach my $build (@builds) { printf OUT " <tr><td class=\"build\"><a href=\"%s\" title=\"%s\">%s</a></td>\n", $build->{name}, $build->{name}, substr($build->{name},0,12); - my @date = gmtime($build->{date}); - printf OUT " <td class=\"date\">%02d %s</td>", $date[3], $months[$date[4]]; + printf OUT " <td class=\"date\">%s</td>", strftime("%b %d", gmtime($build->{date})); my ($total_runs, $total_tests, $total_errors, $total_todos); foreach my $ver (@groups) { @@ -299,4 +297,40 @@ EOF close OUT; rename "data/index.html.new", "data/index.html" or unlink "data/index.html.new"; + +# generate a table of the errors encountered during processing + +my @errors; + +opendir DIR, $queuedir or die "cannot open $queuedir"; +foreach my $dir (readdir DIR) +{ + next unless $dir =~ /^err.....$/; + open ERR, "$queuedir/$dir/error" or next; + my $msg = <ERR>; + chomp $msg; + my $date = (stat ERR)[9]; + close ERR; + push @errors, { msg => $msg, date => $date, url => "../queue/$dir/report" }; +} +closedir DIR; + +open OUT, ">data/errors.html.new" or die "cannot create data/errors.html.new"; + +print OUT start_html( -title => "Errors caught during Wine test report processing", + -style => {src => "/summary.css"}, + -encoding => "utf-8" ); +print OUT "<div class=\"main\"><h2>Errors caught during Wine test report processing</h2>\n"; +print OUT "<table class=\"report\"><thead><tr><th class=\"date\">Date</th><th class=\"commitlink\">Error</th></thread>\n"; + +foreach my $err (sort { $b->{date} <=> $a->{date}; } @errors) +{ + printf OUT "<tr><td class=\"date\">%s</td>\n", strftime("%b %d %H:%M:%S", gmtime($err->{date})); + printf OUT "<td class=\"commitlink\"><a href=\"%s\">%s</a></td></tr>\n", $err->{url}, escapeHTML($err->{msg}); +} +print OUT "</table>", end_html(); +close OUT; + +rename "data/errors.html.new", "data/errors.html" or unlink "data/errors.html.new"; + exit 0;

1 0

Alexandre Julliard : winetest: Use end_form() instead of endform() for newer CGI.pm version.
by Alexandre Julliard March 18, 2016

March 18, 2016

Module: tools Branch: master Commit: d4304df8e59bcc2a0774fe2c9423a31f6ffdb66e URL: http://source.winehq.org/git/tools.git/?a=commit;h=d4304df8e59bcc2a0774fe2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 20:51:32 2016 +0900 winetest: Use end_form() instead of endform() for newer CGI.pm version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/winetest.cgi b/winetest/winetest.cgi index 2daf5cc..98a5260 100755 --- a/winetest/winetest.cgi +++ b/winetest/winetest.cgi @@ -86,7 +86,7 @@ print header, filefield ("reportfile","c:\\temp\\res",45), p, reset, submit ("submit","Upload File"), - endform, + end_form(), hr; if ($error) {

1 0

Alexandre Julliard : winetest: Add the report tag to the error message on parsing errors.
by Alexandre Julliard March 18, 2016

March 18, 2016

Module: tools Branch: master Commit: 88a3af5aa052475067a37cf2bc6cbc67b963223b URL: http://source.winehq.org/git/tools.git/?a=commit;h=88a3af5aa052475067a37cf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 23:55:08 2016 +0900 winetest: Add the report tag to the error message on parsing errors. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 62cd997..2f2faa1 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -55,7 +55,7 @@ use Errno qw/ENOTEMPTY/; $ENV{GIT_DIR} = $gitdir; -my ($report, $tmpdir); +my ($report, $tmpdir, $tag); sub mydie(@) { my $errdir = tempdir ("errXXXXX", DIR => $queuedir); @@ -63,12 +63,13 @@ sub mydie(@) { print STDERR "$name0:error: unable to rename '$tmpdir' to '$errdir': $!\n"; exit 3; } + my $label = substr($tag,1) || "???"; if (open ERR, ">$errdir/error") { - print ERR "$name0:error:$errdir: ", @_; + print ERR "$label: ", @_; close ERR; } - print STDERR "$name0:error:$errdir: ", @_; + print STDERR "$name0:error:$label: ", @_; exit 1; } @@ -112,7 +113,7 @@ $_ = <IN>; if (/^Archive: /) { $_ = <IN>; } # ignore Archive header /^Tag: ([-.0-9a-zA-Z]*)\r?$/ or mydie "no tag line: $_"; -my $tag = $1 eq ""?"":"_$1"; +$tag = $1 eq ""?"":"_$1"; $_ = <IN>; /^Build info:\r?$/ or mydie "no Build info header: $_";

1 0

Jacek Caban : mshtml: Fixed cloning comment nodes.
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: 13079c56961bffdb83ce8205b7ed6fcb2d5cf9e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13079c56961bffdb83ce8205b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 11:49:26 2016 +0100 mshtml: Fixed cloning comment nodes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcomment.c | 16 +++++++++++++++- dlls/mshtml/tests/dom.c | 7 ++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 23bbc82..abb71a8 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -169,11 +169,25 @@ static void HTMLCommentElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } +HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) +{ + HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); + HTMLElement *new_elem; + HRESULT hres; + + hres = HTMLCommentElement_Create(This->element.node.doc, nsnode, &new_elem); + if(FAILED(hres)) + return hres; + + *ret = &new_elem->node; + return S_OK; +} + static const NodeImplVtbl HTMLCommentElementImplVtbl = { HTMLCommentElement_QI, HTMLCommentElement_destructor, HTMLElement_cpc, - HTMLElement_clone, + HTMLCommentElement_clone, HTMLElement_handle_event, HTMLElement_get_attr_col }; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 15a3027..4206e9c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6244,12 +6244,10 @@ static void test_unique_id(IHTMLDocument2 *doc, IHTMLElement *elem) hres = IHTMLUniqueName_get_uniqueID(unique_name, &id); ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); - trace("id %s\n", wine_dbgstr_w(id)); hres = IHTMLUniqueName_get_uniqueID(unique_name, &id2); ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); ok(!lstrcmpW(id, id2), "unique names differ\n"); - trace("id %s\n", wine_dbgstr_w(id2)); hres = IHTMLUniqueName_get_uniqueNumber(unique_name, &num); ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); @@ -6257,7 +6255,6 @@ static void test_unique_id(IHTMLDocument2 *doc, IHTMLElement *elem) sprintf(buf, "ms__id%u", num); ok(!strcmp_wa(id, buf), "unexpected id %s\n", wine_dbgstr_w(id)); - trace("num %d\n", num); SysFreeString(id); SysFreeString(id2); @@ -8907,6 +8904,10 @@ static void test_create_elems(IHTMLDocument2 *doc) test_elem_outerhtml((IUnknown*)comment, ""); test_comment_attrs((IUnknown*)comment); + node2 = clone_node((IUnknown*)comment, VARIANT_TRUE); + test_comment_text((IUnknown*)node2, ""); + IHTMLDOMNode_Release(node2); + IHTMLDOMNode_Release(comment); }

1 0

Hans Leidekker : winhttp/tests: Fix test failures.
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: 05a13fb1558f19687f2a22c6566ed81108f5a5e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a13fb1558f19687f2a22c65… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 17 10:13:59 2016 +0100 winhttp/tests: Fix test failures. These were introduced with the web server upgrade. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index d676dd8..f81c07c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1004,11 +1004,13 @@ static void test_secure_connection(void) ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(!ret || proxy_active(), "succeeded unexpectedly\n"); + ok(ret, "failed to receive response %u\n", GetLastError()); - size = 0; - ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); - ok(!ret, "succeeded unexpectedly\n"); + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "header query failed %u\n", GetLastError()); + ok(status == HTTP_STATUS_BAD_REQUEST, "got %u\n", status); WinHttpCloseHandle(req);

1 0

Pierre Schweitzer : mpr: Don' t send lpRemoteName when requesting network place.
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: e8c8ddcbfc8bc4458add06062005a4022162deab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c8ddcbfc8bc4458add06062… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Wed Mar 16 21:32:35 2016 +0100 mpr: Don't send lpRemoteName when requesting network place. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index fab91c7..0d4209c 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -760,6 +760,11 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage, providerTable->table[index].dwEnumScopes & WNNC_ENUM_GLOBAL) { HANDLE handle; + PWSTR RemoteName = lpNet->lpRemoteName; + + if ((lpNet->dwUsage & RESOURCEUSAGE_CONTAINER) && + RemoteName && !strcmpW(RemoteName, lpNet->lpProvider)) + lpNet->lpRemoteName = NULL; ret = providerTable->table[index].openEnum( dwScope, dwType, dwUsage, lpNet, &handle); @@ -770,6 +775,8 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage, ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; } + + lpNet->lpRemoteName = RemoteName; } else ret = WN_NOT_SUPPORTED;

1 0

Alistair Leslie-Hughes : include: Add authz.h.
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: 2979978a92402af9f53e2211aebc2a553f3d0277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2979978a92402af9f53e2211a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 1 17:46:00 2016 +1100 include: Add authz.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/authz.h | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 7e0456e..596c0c9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -200,6 +200,7 @@ HEADER_SRCS = \ atlwin.h \ audevcod.h \ audiosessiontypes.h \ + authz.h \ aviriff.h \ avrt.h \ basetsd.h \ diff --git a/include/authz.h b/include/authz.h new file mode 100644 index 0000000..42edc8c --- /dev/null +++ b/include/authz.h @@ -0,0 +1,119 @@ +/* + * Copyright (C) 2016 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 + */ + +#ifndef __AUTHZ_H__ +#define __AUTHZ_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_HANDLE(AUTHZ_ACCESS_CHECK_RESULTS_HANDLE); +DECLARE_HANDLE(AUTHZ_CLIENT_CONTEXT_HANDLE); +DECLARE_HANDLE(AUTHZ_RESOURCE_MANAGER_HANDLE); +DECLARE_HANDLE(AUTHZ_AUDIT_EVENT_HANDLE); + +typedef AUTHZ_ACCESS_CHECK_RESULTS_HANDLE *PAUTHZ_ACCESS_CHECK_RESULTS_HANDLE; +typedef AUTHZ_CLIENT_CONTEXT_HANDLE *PAUTHZ_CLIENT_CONTEXT_HANDLE; + +typedef BOOL (CALLBACK *PFN_AUTHZ_COMPUTE_DYNAMIC_GROUPS) ( + AUTHZ_CLIENT_CONTEXT_HANDLE handle, void *args, + PSID_AND_ATTRIBUTES *sid_attr_array, DWORD *sid_cnt, + PSID_AND_ATTRIBUTES *restricted_sid_attr_array, + DWORD *restricted_sid_cnt); + +typedef BOOL (CALLBACK *PFN_AUTHZ_DYNAMIC_ACCESS_CHECK) ( + AUTHZ_CLIENT_CONTEXT_HANDLE handle, PACE_HEADER ace, + void *args, BOOL *ace_applicable); + +typedef VOID (CALLBACK *PFN_AUTHZ_FREE_DYNAMIC_GROUPS) ( + PSID_AND_ATTRIBUTES sid_attr_array); + +typedef struct _AUTHZ_REGISTRATION_OBJECT_TYPE_NAME_OFFSET +{ + WCHAR *szObjectTypeName; + DWORD dwOffset; +} AUTHZ_REGISTRATION_OBJECT_TYPE_NAME_OFFSET, *PAUTHZ_REGISTRATION_OBJECT_TYPE_NAME_OFFSET; + +typedef struct _AUTHZ_ACCESS_REQUEST +{ + ACCESS_MASK DesiredAccess; + PSID PrincipalSelfSid; + POBJECT_TYPE_LIST ObjectTypeList; + DWORD ObjectTypeListLength; + void *OptionalArguments; +} AUTHZ_ACCESS_REQUEST, *PAUTHZ_ACCESS_REQUEST; + + +#define AUTHZ_GENERATE_SUCCESS_AUDIT 0x1 +#define AUTHZ_GENERATE_FAILURE_AUDIT 0x2 + +typedef struct _AUTHZ_ACCESS_REPLY +{ + DWORD ResultListLength; + ACCESS_MASK *GrantedAccessMask; + DWORD *SaclEvaluationResults; + DWORD *Error; +} AUTHZ_ACCESS_REPLY, *PAUTHZ_ACCESS_REPLY; + +typedef struct _AUTHZ_SOURCE_SCHEMA_REGISTRATION +{ + DWORD dwFlags; + WCHAR *szEventSourceName; + WCHAR *szEventMessageFile; + WCHAR *szEventSourceXmlSchemaFile; + WCHAR *szEventAccessStringsFile; + WCHAR *szExecutableImagePath; + + union + { + void *pReserved; + GUID *pProviderGuid; + } DUMMYUNIONNAME; + + DWORD dwObjectTypeNameCount; + AUTHZ_REGISTRATION_OBJECT_TYPE_NAME_OFFSET ObjectTypeNames[ANYSIZE_ARRAY]; +} AUTHZ_SOURCE_SCHEMA_REGISTRATION, *PAUTHZ_SOURCE_SCHEMA_REGISTRATION; + +BOOL WINAPI AuthzInitializeResourceManager(DWORD flags, PFN_AUTHZ_DYNAMIC_ACCESS_CHECK access_checker, + PFN_AUTHZ_COMPUTE_DYNAMIC_GROUPS compute_dyn_groups, PFN_AUTHZ_FREE_DYNAMIC_GROUPS free_dyn_groups, + const WCHAR *managername, AUTHZ_RESOURCE_MANAGER_HANDLE *handle ); + +BOOL WINAPI AuthzInstallSecurityEventSource(DWORD flags, AUTHZ_SOURCE_SCHEMA_REGISTRATION *registration); + +BOOL WINAPI AuthzAccessCheck(DWORD flags, AUTHZ_CLIENT_CONTEXT_HANDLE client_context, + AUTHZ_ACCESS_REQUEST *request, AUTHZ_AUDIT_EVENT_HANDLE audit_event, + PSECURITY_DESCRIPTOR security, PSECURITY_DESCRIPTOR *optional_security, + DWORD optional_security_count, AUTHZ_ACCESS_REPLY *reply, + AUTHZ_ACCESS_CHECK_RESULTS_HANDLE *access_check_result); + +BOOL WINAPI AuthzFreeContext(AUTHZ_CLIENT_CONTEXT_HANDLE client_context); + +BOOL WINAPI AuthzInitializeContextFromSid(DWORD flags, PSID sid, + AUTHZ_RESOURCE_MANAGER_HANDLE resource_manager, LARGE_INTEGER *expire_time, + LUID id, void *dynamic_group, AUTHZ_CLIENT_CONTEXT_HANDLE *client_context); + +BOOL WINAPI AuthzInitializeContextFromToken(DWORD flags, HANDLE token_handle, + AUTHZ_RESOURCE_MANAGER_HANDLE resource_manager, LARGE_INTEGER *expire_time, + LUID id, void *dynamic_group, AUTHZ_CLIENT_CONTEXT_HANDLE *client_context); + +#ifdef __cplusplus +} +#endif + +#endif

1 0