wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Ken Thomases : winemac: Don' t reorder clicked window relative to sibling owned windows if it' s in the right place.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: d14f787192c66a5d339c60fb1bcdb849c1eefa67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d14f787192c66a5d339c60fb1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:35 2013 -0500 winemac: Don't reorder clicked window relative to sibling owned windows if it's in the right place. The right place may not be the end of the list of Cocoa child windows if some of the siblings are at a higher window level (i.e. floating if the clicked window is not). --- dlls/winemac.drv/cocoa_app.m | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 8de68bb..4cb09e7 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1480,8 +1480,28 @@ int macdrv_err_on; // respect to its siblings, but we want it to. We have to do it // manually. NSWindow* parent = [window parentWindow]; - [parent removeChildWindow:window]; - [parent addChildWindow:window ordered:NSWindowAbove]; + NSInteger level = [window level]; + __block BOOL needReorder = FALSE; + + // If the window is already the last child or if it's only below + // children with higher window level, then no need to reorder it. + [[parent childWindows] enumerateObjectsWithOptions:NSEnumerationReverse + usingBlock:^(id obj, NSUInteger idx, BOOL *stop){ + WineWindow* child = obj; + if (child == window) + *stop = TRUE; + else if ([child level] <= level) + { + needReorder = TRUE; + *stop = TRUE; + } + }]; + + if (needReorder) + { + [parent removeChildWindow:window]; + [parent addChildWindow:window ordered:NSWindowAbove]; + } } }

1 0

Nikolay Sivov : kernel32/tests: Test search with alias guid.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 2c31fce106cf43128d0b9a59ae7a72315a7e3633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c31fce106cf43128d0b9a59a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 30 08:03:53 2013 +0400 kernel32/tests: Test search with alias guid. --- dlls/kernel32/tests/actctx.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index fe7aa67..a4e6655 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1117,8 +1117,8 @@ struct comclassredirect_data { static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GUID *tlid, ULONG exid, int line) { - struct comclassredirect_data *comclass; - ACTCTX_SECTION_KEYED_DATA data; + struct comclassredirect_data *comclass, *comclass2; + ACTCTX_SECTION_KEYED_DATA data, data2; BOOL ret; memset(&data, 0xfe, sizeof(data)); @@ -1189,6 +1189,18 @@ todo_wine { ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%u, expected %u\n", data.ulAssemblyRosterIndex, exid); + + /* generated guid for this class works as key guid in search */ + memset(&data2, 0xfe, sizeof(data2)); + data2.cbSize = sizeof(data2); + ret = pFindActCtxSectionGuid(0, NULL, + ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, + &comclass->alias, &data2); + ok_(__FILE__, line)(ret, "FindActCtxSectionGuid failed: %u\n", GetLastError()); + + comclass2 = (struct comclassredirect_data*)data2.lpData; + ok_(__FILE__, line)(comclass->size == comclass2->size, "got wrong data length %d, expected %d\n", comclass2->size, comclass->size); + ok_(__FILE__, line)(!memcmp(comclass, comclass2, comclass->size), "got wrong data\n"); } static void test_wndclass_section(void)

1 0

Nikolay Sivov : ntdll: Implement compatible comClass section.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 88070accd22323cfcf0756861ec9fd9a4c57196f URL: http://source.winehq.org/git/wine.git/?a=commit;h=88070accd22323cfcf0756861… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 30 08:03:28 2013 +0400 ntdll: Implement compatible comClass section. --- dlls/kernel32/tests/actctx.c | 9 +- dlls/ntdll/actctx.c | 282 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 278 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88070accd22323cfcf075…

1 0

Andrew Eikum : comctl32: Return the number of visible months for MCM_GETMONTHDELTA.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 75fbef2ded1f47d5034a6ffc3d0ece99901304b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fbef2ded1f47d5034a6ffc3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 29 14:57:48 2013 -0500 comctl32: Return the number of visible months for MCM_GETMONTHDELTA. --- dlls/comctl32/monthcal.c | 5 ++--- dlls/comctl32/tests/monthcal.c | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ef2ad68..84a01da 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -123,7 +123,6 @@ typedef struct int width_increment; INT delta; /* scroll rate; # of months that the */ /* control moves when user clicks a scroll button */ - int visible; /* # of months visible */ int firstDay; /* Start month calendar with firstDay's day, stored in SYSTEMTIME format */ BOOL firstDaySet; /* first week day differs from locale defined */ @@ -1302,8 +1301,8 @@ MONTHCAL_GetMonthDelta(const MONTHCAL_INFO *infoPtr) if(infoPtr->delta) return infoPtr->delta; - else - return infoPtr->visible; + + return MONTHCAL_GetMonthRange(infoPtr, GMR_VISIBLE, NULL); } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 5440f49..1cadf44 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1325,6 +1325,9 @@ static void test_scroll(void) hwnd = create_monthcal_control(0); + res = SendMessage(hwnd, MCM_GETMONTHDELTA, 0, 0); + expect(2, res); + flush_sequences(sequences, NUM_MSG_SEQUENCES); /* Setter and Getters for scroll rate */

1 0

Alexandre Julliard : patches: Add a link to the testbot job id if available .
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: tools Branch: master Commit: c0f93c48c30159c5b2359927e40dd0ee1d85a49c URL: http://source.winehq.org/git/tools.git/?a=commit;h=c0f93c48c30159c5b2359927… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 17:13:55 2013 +0200 patches: Add a link to the testbot job id if available. --- patches/update | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/patches/update b/patches/update index 52d4d88..4ccc910 100755 --- a/patches/update +++ b/patches/update @@ -115,7 +115,8 @@ print INDEX "<table class=\"main\"><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", "<th class=\"author\">Author</th>", "<th class=\"subject\">Subject</th>", - "<th class=\"status\">Testbot</th></tr>\n"; + "<th class=\"status\">Testbot</th>", + "<th class=\"status\">Job ID</th></tr>\n"; opendir DIR, $dir; foreach my $file (readdir DIR) @@ -146,9 +147,21 @@ foreach my $file (readdir DIR) close ORDER; } $patch{"testbot"} = ""; + $patch{"testjob"} = ""; + $patch{"testurl"} = ""; if (-f "$dir/$file.testbot") { $patch{"testbot"} = "OK"; + if (open LOG, "<$dir/$file.testbot") + { + while (<LOG>) + { + last if /^$/; + if (/^Job-ID: (.*)$/) { $patch{"testjob"} = $1; } + elsif (/^URL: (.*)$/) { $patch{"testurl"} = $1; } + } + close LOG; + } } if (-f "$dir/$file.testfail") { @@ -175,6 +188,16 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k { printf INDEX "<td class=\"testbot\">%s</td>", $patch->{"testbot"}; } + if ($patch->{"testjob"} && $patch->{"testurl"}) + { + printf INDEX "<td class=\"%s\"><a href=\"%s\">%s</a></td>", + ($patch->{"testbot"} eq "Failed") ? " testbot botfail" : "testbot", + $patch->{"testurl"}, $patch->{"testjob"}; + } + else + { + print INDEX "<td></td>"; + } print INDEX "</tr>\n"; $row++; }

1 0

Alexandre Julliard : testbot: Use https URLs when SSL is enabled.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: tools Branch: master Commit: 0909a7476a8da51e7245659e736d92424be8bffc URL: http://source.winehq.org/git/tools.git/?a=commit;h=0909a7476a8da51e7245659e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 17:14:09 2013 +0200 testbot: Use https URLs when SSL is enabled. --- testbot/bin/WineSendLog.pl | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index ce69c21..aec2bee 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -424,6 +424,8 @@ EOF } } + my $WebSite = ($UseSSL ? "https://" : "http://") . $WebHostName; + if ($Messages) { open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); @@ -440,7 +442,7 @@ Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at EOF - print SENDMAIL "http://$WebHostName/JobDetails.pl?Key=", + print SENDMAIL "$WebSite/JobDetails.pl?Key=", $Job->GetKey(), "\n\n"; print SENDMAIL "Your paranoid android.\n\n"; @@ -468,7 +470,7 @@ EOF { print $result "Status: " . ($Messages ? "Failed" : "OK") . "\n"; print $result "Job-ID: " . $Job->Id . "\n"; - print $result "URL: http://$WebHostName/JobDetails.pl?Key=" . $Job->GetKey() . "\n"; + print $result "URL: $WebSite/JobDetails.pl?Key=" . $Job->GetKey() . "\n"; foreach my $Key (@SortedKeys) {

1 0

Alexandre Julliard : patches: Allow specifying the directory that contains the patch data.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: tools Branch: master Commit: 4fe66f8d3a5077f6e8f96d66b113994973fb11ee URL: http://source.winehq.org/git/tools.git/?a=commit;h=4fe66f8d3a5077f6e8f96d66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 16:31:00 2013 +0200 patches: Allow specifying the directory that contains the patch data. --- patches/update | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/patches/update b/patches/update index baf2a2a..52d4d88 100755 --- a/patches/update +++ b/patches/update @@ -84,7 +84,7 @@ my @legend = "<li>The <a href=\"//testbot.winehq.org/\">testbot</a> detected new failures on Windows.</li></ul>" ], ); -my $dir = "$ENV{HOME}/patches"; +my $dir = $ARGV[0] || "$ENV{HOME}/patches"; my $dest = "/home/winehq/opt/source/patches"; my %patches;

1 0

Alexandre Julliard : testbot: Add status and URL fields to the test result file.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: tools Branch: master Commit: 1c345024e5706af0bffdf7286acb11971b9f8937 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1c345024e5706af0bffdf728… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 16:33:46 2013 +0200 testbot: Add status and URL fields to the test result file. --- testbot/bin/WineSendLog.pl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 3c3ff8c..ce69c21 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -466,6 +466,10 @@ EOF } if (open (my $result, ">", "$BaseName.testbot")) { + print $result "Status: " . ($Messages ? "Failed" : "OK") . "\n"; + print $result "Job-ID: " . $Job->Id . "\n"; + print $result "URL: http://$WebHostName/JobDetails.pl?Key=" . $Job->GetKey() . "\n"; + foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key);

1 0

Frédéric Delanoy : winedev: Assorted formatting & tagging fixes.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: docs Branch: master Commit: 1a74d640104c7d516852ea77e74d04dea658d0ca URL: http://source.winehq.org/git/docs.git/?a=commit;h=1a74d640104c7d516852ea77e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 30 09:34:03 2013 +0200 winedev: Assorted formatting & tagging fixes. Note that OLE/COM chapter needs an overhaul but that's outside the scope of this patch. --- en/winedev-ole.sgml | 352 +++++++++++++++++++++++++++------------------------ 1 files changed, 185 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=1a74d640104c7d516852e…

1 0

Hans Leidekker : wininet: Replacing a header with an empty value deletes it .
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 1bf936c900150618717ea3c7aed0bbbfb0d397bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf936c900150618717ea3c7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 29 15:26:18 2013 +0200 wininet: Replacing a header with an empty value deletes it. --- dlls/wininet/http.c | 2 +- dlls/wininet/tests/http.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b6ed7df..954c98b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -6062,7 +6062,7 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR { HTTP_DeleteCustomHeader( request, index ); - if (value) + if (value && value[0]) { HTTPHEADERW hdr; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f04fc7b..bf57223 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1759,6 +1759,27 @@ static void HttpHeaders_test(void) ok(index == 1, "Index was not incremented\n"); ok(strcmp(buffer,"value3")==0, "incorrect string was returned(%s)\n",buffer); + ok(HttpAddRequestHeaders(hRequest, "Authorization: Basic\r\n", -1, HTTP_ADDREQ_FLAG_ADD), + "unable to add header %u\n", GetLastError()); + + index = 0; + buffer[0] = 0; + len = sizeof(buffer); + ok(HttpQueryInfo(hRequest, HTTP_QUERY_AUTHORIZATION|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, &index), + "unable to query header %u\n", GetLastError()); + ok(index == 1, "index was not incremented\n"); + ok(!strcmp(buffer, "Basic"), "incorrect string was returned (%s)\n", buffer); + + ok(HttpAddRequestHeaders(hRequest, "Authorization:\r\n", -1, HTTP_ADDREQ_FLAG_REPLACE), + "unable to remove header %u\n", GetLastError()); + + index = 0; + len = sizeof(buffer); + SetLastError(0xdeadbeef); + ok(!HttpQueryInfo(hRequest, HTTP_QUERY_AUTHORIZATION|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, &index), + "header still present\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "got %u\n", GetLastError()); + ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); done: ok(InternetCloseHandle(hConnect), "Close connect handle failed\n");

1 0

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 August 2013