February 2018 - Wine-commits

Roderick Colenbrander : winevulkan: Implement global Vulkan function stubs and loading.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: 054b7934bd0cad05ed4edbcc5b810c9763ff9fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=054b7934bd0cad05ed4edbcc… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Feb 26 19:42:14 2018 +0100 winevulkan: Implement global Vulkan function stubs and loading. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index ef22a45..228ced7 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -34,12 +34,71 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); */ #define WINE_VULKAN_ICD_VERSION 4 -void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *name) +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif + +struct vulkan_func +{ + const char *name; + void *func; +}; + +static void *wine_vk_get_global_proc_addr(const char *name); + +static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, + const VkAllocationCallbacks *allocator, VkInstance *instance) +{ + FIXME("stub: %p %p %p\n", create_info, allocator, instance); + return VK_ERROR_INCOMPATIBLE_DRIVER; +} + +static VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_name, + uint32_t *count, VkExtensionProperties *properties) +{ + FIXME("stub: %p %p %p\n", layer_name, count, properties); + return VK_ERROR_OUT_OF_HOST_MEMORY; +} + +static PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const char *name) { - FIXME("stub: %p %s\n", instance, debugstr_a(name)); + void *func; + + TRACE("%p %s\n", instance, debugstr_a(name)); + + if (!name) + return NULL; + + /* vkGetInstanceProcAddr can load most Vulkan functions when an instance is passed in, however + * for a NULL instance it can only load global functions. + */ + func = wine_vk_get_global_proc_addr(name); + if (func) + { + return func; + } + if (!instance) + { + FIXME("Global function '%s' not found\n", debugstr_a(name)); + return NULL; + } + + FIXME("Unsupported device or instance function: '%s'\n", debugstr_a(name)); return NULL; } +void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *name) +{ + TRACE("%p %s\n", instance, debugstr_a(name)); + + /* Initial version of the Vulkan ICD spec required vkGetInstanceProcAddr to be + * exported. vk_icdGetInstanceProcAddr was added later to separete ICD calls from + * Vulkan API. One of them in our case should forward to the other, so just forward + * to the older vkGetInstanceProcAddr. + */ + return wine_vkGetInstanceProcAddr(instance, name); +} + VkResult WINAPI wine_vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supported_version) { uint32_t req_version; @@ -69,3 +128,25 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) } return TRUE; } + +static const struct vulkan_func vk_global_dispatch_table[] = +{ + {"vkCreateInstance", &wine_vkCreateInstance}, + {"vkEnumerateInstanceExtensionProperties", &wine_vkEnumerateInstanceExtensionProperties}, + {"vkGetInstanceProcAddr", &wine_vkGetInstanceProcAddr}, +}; + +static void *wine_vk_get_global_proc_addr(const char *name) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(vk_global_dispatch_table); i++) + { + if (strcmp(name, vk_global_dispatch_table[i].name) == 0) + { + TRACE("Found name=%s in global table\n", debugstr_a(name)); + return vk_global_dispatch_table[i].func; + } + } + return NULL; +}

1 0

Nikolay Sivov : msxml3/saxreader: Accept disabled "exhaustive-errors" property.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: 1d78226f514b3026eea466404afde9bae4e8b72f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d78226f514b3026eea46640… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 27 01:16:38 2018 +0300 msxml3/saxreader: Accept disabled "exhaustive-errors" property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 14 +++++++++++++- dlls/msxml3/tests/saxreader.c | 14 ++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index e8d5b27..05c774b 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -100,6 +100,10 @@ static const WCHAR FeatureNamespacePrefixesW[] = { '/','n','a','m','e','s','p','a','c','e','-','p','r','e','f','i','x','e','s',0 }; +static const WCHAR ExhaustiveErrorsW[] = { + 'e','x','h','a','u','s','t','i','v','e','-','e','r','r','o','r','s',0 +}; + struct saxreader_feature_pair { saxreader_feature feature; @@ -107,6 +111,7 @@ struct saxreader_feature_pair }; static const struct saxreader_feature_pair saxreader_feature_map[] = { + { ExhaustiveErrors, ExhaustiveErrorsW }, { ExternalGeneralEntities, FeatureExternalGeneralEntitiesW }, { ExternalParameterEntities, FeatureExternalParameterEntitiesW }, { LexicalHandlerParEntities, FeatureLexicalHandlerParEntitiesW }, @@ -3216,7 +3221,13 @@ static HRESULT WINAPI isaxxmlreader_getFeature( TRACE("(%p)->(%s %p)\n", This, debugstr_w(feature_name), value); feature = get_saxreader_feature(feature_name); - if (feature == Namespaces || feature == NamespacePrefixes) + + if (This->version < MSXML4 && feature == ExhaustiveErrors) + return E_INVALIDARG; + + if (feature == Namespaces || + feature == NamespacePrefixes || + feature == ExhaustiveErrors) return get_feature_value(This, feature, value); FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(feature_name), value); @@ -3238,6 +3249,7 @@ static HRESULT WINAPI isaxxmlreader_putFeature( /* accepted cases */ if ((feature == ExternalGeneralEntities && value == VARIANT_FALSE) || (feature == ExternalParameterEntities && value == VARIANT_FALSE) || + (feature == ExhaustiveErrors && value == VARIANT_FALSE) || feature == Namespaces || feature == NamespacePrefixes) { diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 9ebed62..29492fa 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2789,6 +2789,20 @@ static void test_saxreader_features(void) continue; } + value = VARIANT_TRUE; + hr = ISAXXMLReader_getFeature(reader, _bstr_("exhaustive-errors"), &value); + if (IsEqualGUID(entry->guid, &CLSID_SAXXMLReader40) || + IsEqualGUID(entry->guid, &CLSID_SAXXMLReader60)) + { + ok(hr == S_OK, "Failed to get feature value, hr %#x.\n", hr); + ok(value == VARIANT_FALSE, "Unexpected default feature value.\n"); + + hr = ISAXXMLReader_putFeature(reader, _bstr_("exhaustive-errors"), VARIANT_FALSE); + ok(hr == S_OK, "Failed to put feature value, hr %#x.\n", hr); + } + else + ok(hr == E_INVALIDARG, "Unexpected return value %#x.\n", hr); + name = feature_names; while (*name) {

1 0

Nikolay Sivov : msxml3/saxreader: Accept external-general-entities and external-parameter-entities.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: 585e12fa9d3fbf3e3460350e44597d7c0ec18ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=585e12fa9d3fbf3e3460350e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 27 01:16:39 2018 +0300 msxml3/saxreader: Accept external-general-entities and external-parameter-entities. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 05c774b..2a30475 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -3247,16 +3247,17 @@ static HRESULT WINAPI isaxxmlreader_putFeature( feature = get_saxreader_feature(feature_name); /* accepted cases */ - if ((feature == ExternalGeneralEntities && value == VARIANT_FALSE) || - (feature == ExternalParameterEntities && value == VARIANT_FALSE) || - (feature == ExhaustiveErrors && value == VARIANT_FALSE) || + if ((feature == ExhaustiveErrors && value == VARIANT_FALSE) || feature == Namespaces || feature == NamespacePrefixes) { return set_feature_value(This, feature, value); } - if (feature == LexicalHandlerParEntities || feature == ProhibitDTD) + if (feature == LexicalHandlerParEntities || + feature == ProhibitDTD || + feature == ExternalGeneralEntities || + feature == ExternalParameterEntities) { FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature_name), value); return set_feature_value(This, feature, value);

1 0

Francois Gouget : testbot: Fail test units that spam the test report.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: tools Branch: master Commit: afc41c0fdcf87692f34cad61b1d9d5538dd89b26 URL: https://source.winehq.org/git/tools.git/?a=commit;h=afc41c0fdcf87692f34cad6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 27 02:43:45 2018 +0100 testbot: Fail test units that spam the test report. To not exceed the maximum report size, each test unit must print less than 2.5KB of traces on average. So report tests that hog more than 10 times that. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 8 ++++++++ testbot/lib/WineTestBot/Config.pm | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 65faf72..46b11f3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -511,6 +511,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # track of the current one. Note that for the TestBot we don't count or # complain about misplaced skips. my ($CurrentDll, $CurrentUnit) = ("", ""); + my $UnitSize = 0; my ($LineFailures, $LineTodos, $LineSkips) = (0, 0, 0); my ($SummaryFailures, $SummaryTodos, $SummarySkips) = (0, 0, 0); my ($CurrentIsBroken, %CurrentPids, $CurrentRc, $LogFailures); @@ -564,6 +565,11 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # so only use them as a fallback. $LineFailures ||= $SummaryFailures; + if ($UnitSize > $MaxUnitSize) + { + LogTaskError("$CurrentDll:$CurrentUnit prints too much data ($UnitSize bytes)\n"); + $LogFailures++; + } if (!$CurrentIsBroken and defined $CurrentRc) { # Check the exit code, particularly against failures reported @@ -601,6 +607,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) $LogFailures += $LineFailures; $CurrentDll = $CurrentUnit = ""; + $UnitSize = 0; $LineFailures = $LineTodos = $LineSkips = 0; $SummaryFailures = $SummaryTodos = $SummarySkips = 0; $CurrentIsBroken = 0; @@ -610,6 +617,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) foreach my $Line (<$LogFile>) { + $UnitSize += length($Line); if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) { my ($Dll, $Unit, $Type) = ($1, $2, $3); diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 02c9dac..9052fc4 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -32,7 +32,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $SleepAfterRevert $WaitForToolsInVM $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout - $BuildTimeout $ReconfigTimeout $TagPrefix + $BuildTimeout $ReconfigTimeout $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel @@ -47,7 +47,7 @@ require Exporter; $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout - $TagPrefix $ProjectName $PatchesMailingList + $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel $TunnelDefaults $PrettyHostNames $JobPurgeDays $JobArchiveDays @@ -96,6 +96,8 @@ $BuildTimeout = 5 * 60; # How long to let a full recompilation run before forcibly shutting it down # (in seconds). $ReconfigTimeout = 45 * 60; +# Maximum amount of traces for a test unit. +$MaxUnitSize = 32 * 1024; $ProjectName = "Wine"; $PatchesMailingList = "wine-devel";

1 0

Francois Gouget : testbot: Show the VM configuration on the Job details page.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: tools Branch: master Commit: d9d84229e4e63ee659a10442aa60852ceeda7b8a URL: https://source.winehq.org/git/tools.git/?a=commit;h=d9d84229e4e63ee659a1044… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 27 02:44:04 2018 +0100 testbot: Show the VM configuration on the Job details page. This makes it easier to use the VM configuration details when analyzing the test results. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index e825da4..7ca7889 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -248,6 +248,12 @@ sub GenerateBody($) my $VM = $Item->VM; print "<h2><a name='k", $self->escapeHTML($Key), "'></a>" , $self->escapeHTML($Item->GetTitle()), "</h2>\n"; + + print "<details><summary>", + $self->CGI->escapeHTML($VM->Description || $VM->Name), "</summary>", + $self->CGI->escapeHTML($VM->Details || "No details!"), + "</details>\n"; + my $ScreenshotParamName = "scrshot_$Key"; my $FullLogParamName = "log_$Key"; my $LogName = "$TaskDir/log"; @@ -321,6 +327,7 @@ sub GenerateBody($) } } print "</div>\n"; + if (open LOGFILE, "<$LogName") { my $HasLogEntries = !1;

1 0

Francois Gouget : testbot: Show the VM configuration details when submitting a job.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: tools Branch: master Commit: 5a92f4bf051c2e416a2b72a28595887dc638755e URL: https://source.winehq.org/git/tools.git/?a=commit;h=5a92f4bf051c2e416a2b72a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 27 02:44:33 2018 +0100 testbot: Show the VM configuration details when submitting a job. The VMs are now shown in a table and their short description can be expanded to show the full configuration. This can help select the right set of VMs for the tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 40 +++++++++++++++++++++++----------------- testbot/web/WineTestBot.css | 13 +++++++++++++ 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 0e9aef3..875384e 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -230,7 +230,12 @@ sub GenerateFields($) { print "<div><input type='hidden' name='ShowAll' value='1'></div>\n"; } - + print "<div class='CollectionBlock'><table>\n"; + print "<thead><tr><th class='Record'></th>\n"; + print "<th class='Record'>VM Name</th>\n"; + print "<th class='Record'>Description</th>\n"; + print "</th><tbody>\n"; + my $VMs = CreateVMs(); if ($self->{FileType} eq "exe64" || $self->{FileType} eq "dll64") { @@ -249,36 +254,37 @@ sub GenerateFields($) { $VMs->AddFilter("Role", ["base"]); } + my $Even = 1; my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); foreach my $VMKey (@$SortedKeys) { my $VM = $VMs->GetItem($VMKey); my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - print "<div class='ItemProperty'><label>", - $self->CGI->escapeHTML($VM->Name); - if ($VM->Description) - { - print " (", $self->CGI->escapeHTML($VM->Description), ")"; - } - my $Checked = 1; - if ($VM->Status eq 'offline') - { - print " [offline]"; - $Checked = undef; - } - elsif ($VM->Status eq 'maintenance') + print "<tr class='", ($Even ? "even" : "odd"), + "'><td><input name='$FieldName' type='checkbox'"; + $Even = !$Even; + my ($Checked, $Status) = (1, ""); + if ($VM->Status =~ /^(offline|maintenance)$/) { - print " [maintenance]"; + $Status = " [". $VM->Status ."]"; $Checked = undef; } - print "</label><div class='ItemValue'><input type='checkbox' name='$FieldName'"; if ($Checked and ($self->GetParam("Page") == 1 || $self->GetParam($FieldName))) { print " checked='checked'"; } - print "/></div></div>\n"; + print "/></td>\n"; + + print "<td>", $self->CGI->escapeHTML($VM->Name), "</td>\n"; + print "<td><details><summary>", + $self->CGI->escapeHTML($VM->Description || $VM->Name), + "$Status</summary>", + $self->CGI->escapeHTML($VM->Details || "No details!"), + "</details></td>"; + print "</tr>\n"; } + print "</tbody></table>\n"; } else { diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 2ccce24..ebc622e 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -317,6 +317,19 @@ h2 padding-bottom: 0.1em; } +details +{ + font-style: italic; + color: #505050; +} + +summary +{ + font-style: normal; + color: black; +} + + pre { margin: 0;

1 0

Francois Gouget : testbot/web: Add the VM name as a tooltip for reverts on the Activity page.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: tools Branch: master Commit: 23bbea1472d08f34cfabd2af9b516b379aec059e URL: https://source.winehq.org/git/tools.git/?a=commit;h=23bbea1472d08f34cfabd2a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 27 02:48:28 2018 +0100 testbot/web: Add the VM name as a tooltip for reverts on the Activity page. This helps keep track of which column corresponds to which VM when scrolling down the activity page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 91153b3..d5fe6f3 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -238,6 +238,10 @@ EOF { $Label = $VMStatus->{details} || $VMStatus->{status}; } + elsif ($VMStatus->{status} eq "reverting") + { + $Label = "<a class='title' title='". $VM->Name ."'>reverting</a>"; + } else { $Label = $VMStatus->{status};

1 0

Alex Henrie : ieframe/tests: Mark an IE test as todo on x64 and ARM.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: a067ceb538e4fc8b7a95c5bf763201232c213faa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a067ceb538e4fc8b7a95c5bf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 12 19:48:23 2018 -0700 ieframe/tests: Mark an IE test as todo on x64 and ARM. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/ie.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index cb901d7..37845dc 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -261,6 +261,9 @@ static void test_InternetExplorer(void) return; hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); +#ifndef __i386__ +todo_wine +#endif ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); if (hres != S_OK) { IUnknown_Release(unk);

1 0

Jacek Caban : urlmon: Use HttpQueryInfoA in IWinInetHttpInfo:: QueryInfo implementation.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 216ad43f18fdf08b1c76758120c6bedbdf7043c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=216ad43f18fdf08b1c767581… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 26 18:21:02 2018 +0100 urlmon: Use HttpQueryInfoA in IWinInetHttpInfo::QueryInfo implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/http.c | 8 +++---- dlls/urlmon/tests/protocol.c | 51 +++++++++++++++++++++++++++++++------------- 2 files changed, 39 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 2fd9be6..9cc6117 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -912,11 +912,9 @@ static HRESULT WINAPI HttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption if(!This->base.request) return E_FAIL; - if(!HttpQueryInfoW(This->base.request, dwOption, pBuffer, pcbBuffer, pdwFlags)) { - if(pBuffer) - memset(pBuffer, 0, *pcbBuffer); - return S_OK; - } + if(!HttpQueryInfoA(This->base.request, dwOption, pBuffer, pcbBuffer, pdwFlags)) + return S_FALSE; + return S_OK; } diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index d88aa07..4ca4327 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -940,6 +940,39 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, return S_OK; } +static void test_http_info(IInternetProtocol *protocol) +{ + IWinInetHttpInfo *info; + char buf[1024]; + DWORD size, len; + HRESULT hres; + + static const WCHAR connectionW[] = {'c','o','n','n','e','c','t','i','o','n',0}; + + hres = IInternetProtocol_QueryInterface(protocol, &IID_IWinInetHttpInfo, (void**)&info); + ok(hres == S_OK, "Could not get IWinInterHttpInfo iface: %08x\n", hres); + + size = sizeof(buf); + strcpy(buf, "connection"); + hres = IWinInetHttpInfo_QueryInfo(info, HTTP_QUERY_CUSTOM, buf, &size, NULL, NULL); + if(tested_protocol != FTP_TEST) { + ok(hres == S_OK, "QueryInfo failed: %08x\n", hres); + + ok(!strcmp(buf, "Keep-Alive"), "buf = %s\n", buf); + len = strlen(buf); + ok(size == len, "size = %u, expected %u\n", size, len); + + size = sizeof(buf); + memcpy(buf, connectionW, sizeof(connectionW)); + hres = IWinInetHttpInfo_QueryInfo(info, HTTP_QUERY_CUSTOM, buf, &size, NULL, NULL); + ok(hres == S_FALSE, "QueryInfo returned %08x\n", hres); + }else { + ok(hres == S_FALSE, "QueryInfo failed: %08x\n", hres); + } + + IWinInetHttpInfo_Release(info); +} + static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) { @@ -1071,6 +1104,9 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR "grcfBSCF = %08x\n", grfBSCF); } + if((grfBSCF & BSCF_FIRSTDATANOTIFICATION) && !binding_test) + test_http_info(async_protocol); + if(!(bindf & BINDF_FROMURLMON) && !(grfBSCF & BSCF_LASTDATANOTIFICATION)) { if(state == STATE_CONNECTING) { @@ -3129,19 +3165,6 @@ static void test_protocol_terminate(IInternetProtocol *protocol) ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); } -static void test_http_info(IInternetProtocol *protocol) -{ - IWinInetHttpInfo *info; - HRESULT hres; - - hres = IInternetProtocol_QueryInterface(protocol, &IID_IWinInetHttpInfo, (void**)&info); - ok(hres == S_OK, "Could not get IWinInterHttpInfo iface: %08x\n", hres); - - /* TODO */ - - IWinInetHttpInfo_Release(info); -} - /* is_first refers to whether this is the first call to this function * _for this url_ */ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tymed) @@ -3183,7 +3206,6 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym ULONG ref; test_priority(async_protocol); - test_http_info(async_protocol); SET_EXPECT(ReportProgress_COOKIE_SENT); if(http_is_first) { @@ -3452,7 +3474,6 @@ static void test_ftp_protocol(void) ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); test_priority(async_protocol); - test_http_info(async_protocol); SET_EXPECT(GetBindInfo); SET_EXPECT(ReportProgress_FINDINGRESOURCE);

1 0

Jacek Caban : mshtml: Support X-UA-Compatible HTTP header.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 9ae8b8c00f2cca205fdf4ce76e221778b7dfbea7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ae8b8c00f2cca205fdf4ce7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 26 18:21:11 2018 +0100 mshtml: Support X-UA-Compatible HTTP header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 1 + dlls/mshtml/mutation.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/navigate.c | 9 ++++++++- 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 71c477a..f754bad 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -147,6 +147,7 @@ HRESULT load_uri(HTMLOuterWindow*,IUri*,DWORD) DECLSPEC_HIDDEN; HRESULT navigate_new_window(HTMLOuterWindow*,IUri*,const WCHAR*,request_data_t*,IHTMLWindow2**) DECLSPEC_HIDDEN; HRESULT navigate_url(HTMLOuterWindow*,const WCHAR*,IUri*,DWORD) DECLSPEC_HIDDEN; HRESULT submit_form(HTMLOuterWindow*,const WCHAR*,IUri*,nsIInputStream*) DECLSPEC_HIDDEN; +void process_document_response_headers(HTMLDocumentNode*,IBinding*) DECLSPEC_HIDDEN; void init_bscallback(BSCallback*,const BSCallbackVtbl*,IMoniker*,DWORD) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 4e1e053..555a99b 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -29,6 +29,7 @@ #include "winreg.h" #include "ole2.h" #include "shlguid.h" +#include "wininet.h" #include "mshtml_private.h" #include "htmlscript.h" @@ -394,6 +395,8 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) static const WCHAR edgeW[] = {'e','d','g','e',0}; + TRACE("%s\n", debugstr_w(p)); + if(p[0] != 'I' || p[1] != 'E' || p[2] != '=') return FALSE; p += 3; @@ -432,6 +435,39 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) return TRUE; } +void process_document_response_headers(HTMLDocumentNode *doc, IBinding *binding) +{ + IWinInetHttpInfo *http_info; + char buf[1024]; + DWORD size; + HRESULT hres; + + hres = IBinding_QueryInterface(binding, &IID_IWinInetHttpInfo, (void**)&http_info); + if(FAILED(hres)) { + TRACE("No IWinInetHttpInfo\n"); + return; + } + + size = sizeof(buf); + strcpy(buf, "X-UA-Compatible"); + hres = IWinInetHttpInfo_QueryInfo(http_info, HTTP_QUERY_CUSTOM, buf, &size, NULL, NULL); + if(hres == S_OK && size) { + compat_mode_t document_mode; + WCHAR *header; + + TRACE("size %u\n", size); + + header = heap_strdupAtoW(buf); + if(header && parse_ua_compatible(header, &document_mode)) { + TRACE("setting document mode %d\n", document_mode); + doc->document_mode = document_mode; + } + heap_free(header); + } + + IWinInetHttpInfo_Release(http_info); +} + static void process_meta_element(HTMLDocumentNode *doc, nsIDOMHTMLMetaElement *meta_element) { nsAString http_equiv_str, content_str; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index a8d3330..9d6076d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1003,9 +1003,16 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This) } if(This->is_doc_channel) { + HRESULT hres; + if(!This->bsc.window) return E_ABORT; /* Binding aborted in OnStartRequest call. */ - update_window_doc(This->bsc.window); + hres = update_window_doc(This->bsc.window); + if(FAILED(hres)) + return hres; + + if(This->bsc.binding) + process_document_response_headers(This->bsc.window->doc, This->bsc.binding); if(This->bsc.window->base.outer_window->readystate != READYSTATE_LOADING) set_ready_state(This->bsc.window->base.outer_window, READYSTATE_LOADING); }

1 0