February 2018 - Wine-devel - list.winehq.org

[PATCH 2/2] adsldp: Add a stub for IADsADSystemInfo.
by Dmitry Timoshkov 08 Feb '18

08 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/adsldp/Makefile.in | 7 + dlls/adsldp/adsldp.c | 358 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/adsldp/adsldp.idl | 23 ++++ dlls/adsldp/adsldp.spec | 4 + 5 files changed, 393 insertions(+) create mode 100644 dlls/adsldp/Makefile.in create mode 100644 dlls/adsldp/adsldp.c create mode 100644 dlls/adsldp/adsldp.idl create mode 100644 dlls/adsldp/adsldp.spec diff --git a/configure.ac b/configure.ac index 58ce104866..14cc80db3b 100644 --- a/configure.ac +++ b/configure.ac @@ -2793,6 +2793,7 @@ WINE_CONFIG_DLL(aclui,,[implib]) WINE_CONFIG_DLL(activeds,,[implib]) WINE_CONFIG_DLL(actxprxy,,[clean]) WINE_CONFIG_LIB(adsiid) +WINE_CONFIG_DLL(adsldp) WINE_CONFIG_DLL(adsldpc) WINE_CONFIG_DLL(advapi32,,[clean,implib]) WINE_CONFIG_TEST(dlls/advapi32/tests) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in new file mode 100644 index 0000000000..e033d91a7e --- /dev/null +++ b/dlls/adsldp/Makefile.in @@ -0,0 +1,7 @@ +MODULE = adsldp.dll + +C_SRCS = \ + adsldp.c + +IDL_SRCS = \ + adsldp.idl diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c new file mode 100644 index 0000000000..15f1d23acd --- /dev/null +++ b/dlls/adsldp/adsldp.c @@ -0,0 +1,358 @@ +/* + * Active Directory services LDAP Provider + * + * Copyright 2018 Dmitry Timoshkov + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "iads.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(adsldp); + +static HMODULE adsldp_hinst; + +typedef struct +{ + IADsADSystemInfo IADsADSystemInfo_iface; + LONG ref; +} AD_sysinfo; + +static inline AD_sysinfo *impl_from_IADsADSystemInfo(IADsADSystemInfo *iface) +{ + return CONTAINING_RECORD(iface, AD_sysinfo, IADsADSystemInfo_iface); +} + +static HRESULT WINAPI sysinfo_QueryInterface(IADsADSystemInfo *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IADsADSystemInfo) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IADsADSystemInfo_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI sysinfo_AddRef(IADsADSystemInfo *iface) +{ + AD_sysinfo *sysinfo = impl_from_IADsADSystemInfo(iface); + return InterlockedIncrement(&sysinfo->ref); +} + +static ULONG WINAPI sysinfo_Release(IADsADSystemInfo *iface) +{ + AD_sysinfo *sysinfo = impl_from_IADsADSystemInfo(iface); + LONG ref = InterlockedDecrement(&sysinfo->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + HeapFree(GetProcessHeap(), 0, sysinfo); + } + + return ref; +} + +static HRESULT WINAPI sysinfo_GetTypeInfoCount(IADsADSystemInfo *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_GetTypeInfo(IADsADSystemInfo *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_GetIDsOfNames(IADsADSystemInfo *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_Invoke(IADsADSystemInfo *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_UserName(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_ComputerName(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_SiteName(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_DomainShortName(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_DomainDNSName(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_ForestDNSName(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_PDCRoleOwner(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_SchemaRoleOwner(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_IsNativeMode(IADsADSystemInfo *iface, VARIANT_BOOL *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_GetAnyDCName(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_GetDCSiteName(IADsADSystemInfo *iface, BSTR server, BSTR *retval) +{ + FIXME("%p,%s,%p: stub\n", iface, debugstr_w(server), retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_RefreshSchemaCache(IADsADSystemInfo *iface) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_GetTrees(IADsADSystemInfo *iface, VARIANT *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static const IADsADSystemInfoVtbl IADsADSystemInfo_vtbl = +{ + sysinfo_QueryInterface, + sysinfo_AddRef, + sysinfo_Release, + sysinfo_GetTypeInfoCount, + sysinfo_GetTypeInfo, + sysinfo_GetIDsOfNames, + sysinfo_Invoke, + sysinfo_get_UserName, + sysinfo_get_ComputerName, + sysinfo_get_SiteName, + sysinfo_get_DomainShortName, + sysinfo_get_DomainDNSName, + sysinfo_get_ForestDNSName, + sysinfo_get_PDCRoleOwner, + sysinfo_get_SchemaRoleOwner, + sysinfo_get_IsNativeMode, + sysinfo_GetAnyDCName, + sysinfo_GetDCSiteName, + sysinfo_RefreshSchemaCache, + sysinfo_GetTrees +}; + +static HRESULT ADSystemInfo_create(void **obj) +{ + AD_sysinfo *sysinfo; + + sysinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*sysinfo)); + if (!sysinfo) return E_OUTOFMEMORY; + + sysinfo->IADsADSystemInfo_iface.lpVtbl = &IADsADSystemInfo_vtbl; + sysinfo->ref = 1; + *obj = &sysinfo->IADsADSystemInfo_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ + IClassFactory IClassFactory_iface; + HRESULT (*constructor)(void **); +} ADSystemInfo_factory; + +static inline ADSystemInfo_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ADSystemInfo_factory, IClassFactory_iface); +} + +static HRESULT WINAPI factory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *obj = iface; + return S_OK; + } + + *obj = NULL; + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI factory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) +{ + ADSystemInfo_factory *factory = impl_from_IClassFactory(iface); + IUnknown *unknown; + HRESULT hr; + + TRACE("%p,%s,%p\n", outer, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + *obj = NULL; + if (outer) return CLASS_E_NOAGGREGATION; + + hr = factory->constructor((void **)&unknown); + if (hr == S_OK) + { + hr = IUnknown_QueryInterface(unknown, riid, obj); + IUnknown_Release(unknown); + } + return hr; +} + +static HRESULT WINAPI factory_LockServer(IClassFactory *iface, BOOL lock) +{ + FIXME("%p,%d: stub\n", iface, lock); + return S_OK; +} + +static const struct IClassFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + factory_CreateInstance, + factory_LockServer +}; + +static ADSystemInfo_factory ADSystemInfo_cf = { { &factory_vtbl }, ADSystemInfo_create }; + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) +{ + TRACE("%s,%s,%p\n", debugstr_guid(clsid), debugstr_guid(iid), obj); + + if (!clsid || !iid || !obj) return E_INVALIDARG; + + *obj = NULL; + + if (IsEqualGUID(clsid, &CLSID_ADSystemInfo)) + return IClassFactory_QueryInterface(&ADSystemInfo_cf.IClassFactory_iface, iid, obj); + + FIXME("class %s/%s is not implemented\n", debugstr_guid(clsid), debugstr_guid(iid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(adsldp_hinst); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(adsldp_hinst); +} + +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) +{ + TRACE("%p,%u,%p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + adsldp_hinst = hinst; + DisableThreadLibraryCalls(hinst); + break; + } + + return TRUE; +} diff --git a/dlls/adsldp/adsldp.idl b/dlls/adsldp/adsldp.idl new file mode 100644 index 0000000000..26faff5656 --- /dev/null +++ b/dlls/adsldp/adsldp.idl @@ -0,0 +1,23 @@ +/* + * Active Directory services LDAP Provider + * + * Copyright 2018 Dmitry Timoshkov + * + * 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 + */ + +#pragma makedep register + +#include "iads.idl" diff --git a/dlls/adsldp/adsldp.spec b/dlls/adsldp/adsldp.spec new file mode 100644 index 0000000000..b16365d0c9 --- /dev/null +++ b/dlls/adsldp/adsldp.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() -- 2.16.1

1 0

[PATCH 2/2] testbot: Fix activity statistics for short periods of time.
by Francois Gouget 08 Feb '18

08 Feb '18

When looking at the activity for a VM we get an initial 'unknown' segment that goes up to the first record for that VM. This is because we don't know what the state of the VM was before that first record. For long periods it does not matter much but for short ones, say 5 minutes, an unknown segment could be all we have if the VM has been in the same state for more than 5 minutes, for instance while running a task. So analyze the activity beyond the specified period, up to the largest amount of time a task can take so we are sure to get the VM's 'previous' record. Then, when computing the statistics, ignore any data that falls outside the period under consideration. Of course this only works for statistics about VM operations and running tasks (so running.time, reverting.time, etc) not for those about idle or off VMs (idle.time, etc.). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index df1cc59ff..4aed4ed0c 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -412,11 +412,33 @@ sub GetStatistics($;$) @JobTimes = (); # free early } - my ($Activity, $Counters) = GetActivity($VMs, $Seconds); + my $ActivitySeconds; + if ($Seconds) + { + # When looking at the activity for a VM we get an initial 'unknown' segment + # that goes up to the first record for that VM. This is because we don't + # know what the state of the VM was before that first record. + # For long periods it does not matter much but for short ones, say 5 + # minutes, an unknown segment could be all we have if the VM has been in + # the same state for more than 5 minutes, for instance while running a + # task. + # So analyze the activity beyond the specified period, up to the largest + # amount of time a task can take so are sure to get the VM's 'previous' + # record. Then when computing the statistics, ignore any data that falls + # outside the period under consideration. + # Of course this only works for statistics about VM operations and running + # tasks (so running.time, reverting.time, etc) not for those about idle or + # off VMs (idle.time, etc.). + $ActivitySeconds = $Seconds + 60 + + ($SuiteTimeout > $ReconfigTimeout ? $SuiteTimeout : $ReconfigTimeout); + } + my ($Activity, $Counters) = GetActivity($VMs, $ActivitySeconds); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; $GlobalStats->{"records.count"} = $Counters->{records}; foreach my $Group (@$Activity) { + next if ($Group->{end} < $Cutoff); + _UpdateMin($VMsStats->{start}, $Group->{start}); next if (!$Group->{statusvms}); -- 2.15.1

1 0

[PATCH 1/2] testbot: Allow restricting the statistics to the recent past.
by Francois Gouget 08 Feb '18

08 Feb '18

Over long periods of time (days) and as long as the TestBot can keep up, the job & task creation rate should be almost identical to the job and task completion rate (modulo build errors for tasks). But for short periods (under an hour) they can be significantly different. Specifically the job and task completion rates are capped by the TestBot's processing speed, while the job and task creation rates are not. This means jobs must be filtered based on their Submitted field when counting new jobs, and on their Ended field when dealing with completed jobs. Rename the job and task counters to newjobs and newtasks to emphasize that they count new jobs and tasks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 32 +++++++++++++++++++++----------- testbot/web/Stats.pl | 12 ++++++------ 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 5122dc36f..df1cc59ff 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -43,6 +43,12 @@ sub _UpdateMin($$) $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]); } +sub max($$) +{ + my ($a, $b) = @_; + return $a > $b ? $a : $b; +} + =pod =over 12 @@ -336,18 +342,20 @@ sub _AddFullStat($$$$;$) } } -sub GetStatistics($) +sub GetStatistics($;$) { - my ($VMs) = @_; + my ($VMs, $Seconds) = @_; my ($GlobalStats, $HostsStats, $VMsStats) = ({}, {}, {}); my @JobTimes; my $Jobs = CreateJobs(); + my $Cutoff = $Seconds ? (time() - $Seconds) : 0; foreach my $Job (@{$Jobs->GetItems()}) { - $GlobalStats->{"jobs.count"}++; - _UpdateMin($GlobalStats->{start}, $Job->Submitted); + my $CountsAsNew = ($Job->Submitted >= $Cutoff); + $GlobalStats->{"newjobs.count"}++ if ($CountsAsNew); + _UpdateMin($GlobalStats->{start}, max($Cutoff, $Job->Submitted)); my $IsSpecialJob; my $Steps = $Job->Steps; @@ -359,9 +367,11 @@ sub GetStatistics($) my $Tasks = $Step->Tasks; foreach my $Task (@{$Tasks->GetItems()}) { - $GlobalStats->{"tasks.count"}++; - if ($Task->Started and $Task->Ended and - $Task->Status !~ /^(?:queued|running|canceled)$/) + $GlobalStats->{"newtasks.count"}++ if ($CountsAsNew); + next if (!$Task->Ended or $Task->Ended < $Cutoff); + + # $Task->Started should really be set since $Task->Ended is + if ($Task->Started and $Task->Status !~ /^(?:queued|running|canceled)$/) { my $Time = $Task->Ended - $Task->Started; _AddFullStat($GlobalStats, "$StepType.time", $Time, undef, $Task); @@ -383,7 +393,7 @@ sub GetStatistics($) } } - if (!$IsSpecialJob and$Job->Ended and + if (!$IsSpecialJob and $Job->Ended and $Job->Ended >= $Cutoff and $Job->Status !~ /^(?:queued|running|canceled)$/) { my $Time = $Job->Ended - $Job->Submitted; @@ -402,7 +412,7 @@ sub GetStatistics($) @JobTimes = (); # free early } - my ($Activity, $Counters) = GetActivity($VMs); + my ($Activity, $Counters) = GetActivity($VMs, $Seconds); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; $GlobalStats->{"records.count"} = $Counters->{records}; foreach my $Group (@$Activity) @@ -456,14 +466,14 @@ sub GetStatistics($) # Note that we cannot simply sum the VMs busy wall clock times to get # the host busy wall clock time because this would count periods where # more than one VM is busy multiple times. - $HostStats->{"busy.elapsed"} += $Group->{end} - $Group->{start}; + $HostStats->{"busy.elapsed"} += $Group->{end} - max($Cutoff, $Group->{start}); $IsHostBusy{$Host} = 1; $IsGroupBusy = 1; } } if ($IsGroupBusy) { - $GlobalStats->{"busy.elapsed"} += $Group->{end} - $Group->{start}; + $GlobalStats->{"busy.elapsed"} += $Group->{end} - max($Cutoff, $Group->{start}); } } diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 9db2ad377..51a72278e 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -206,12 +206,12 @@ sub GenerateBody($) _GenGlobalLine($GlobalStats, "elapsed", "Job history", "How far back the job history goes."); - _GenGlobalLine($GlobalStats, "jobs.count", "Job count", "The number of jobs in the job history."); - _AddRate($GlobalStats, "jobs.count"); - _GenGlobalLine($GlobalStats, "jobs.rate", "Job rate", "How fast new jobs are coming in."); - _GenGlobalLine($GlobalStats, "tasks.count", "Task count", "The number of tasks."); - _AddRate($GlobalStats, "tasks.count"); - _GenGlobalLine($GlobalStats, "tasks.rate", "Task rate", "How fast new tasks are coming in."); + _GenGlobalLine($GlobalStats, "newjobs.count", "Job count", "The number of jobs in the job history."); + _AddRate($GlobalStats, "newjobs.count"); + _GenGlobalLine($GlobalStats, "newjobs.rate", "Job rate", "How fast new jobs are coming in."); + _GenGlobalLine($GlobalStats, "newtasks.count", "Task count", "The number of tasks."); + _AddRate($GlobalStats, "newtasks.count"); + _GenGlobalLine($GlobalStats, "newtasks.rate", "Task rate", "How fast new tasks are coming in."); _GenGlobalLine($GlobalStats, "busy.elapsed", "Busy time", "How much wall clock time was spent running jobs.", $NO_PERCENTAGE); _GenGlobalLine($GlobalStats, "busy.elapsed", "Busy \%", "The percentage of wall clock time where the TestBot was busy running jobs."); -- 2.15.1

1 0

[PATCH 5/5] d3drm: Use the global memory allocation helpers.
by Henri Verbeet 08 Feb '18

08 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3drm/d3drm.c | 4 +- dlls/d3drm/d3drm_main.c | 13 +++--- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/device.c | 4 +- dlls/d3drm/face.c | 4 +- dlls/d3drm/frame.c | 52 +++++++++++------------ dlls/d3drm/light.c | 4 +- dlls/d3drm/material.c | 4 +- dlls/d3drm/meshbuilder.c | 103 +++++++++++++++++++++------------------------ dlls/d3drm/texture.c | 4 +- dlls/d3drm/viewport.c | 4 +- 11 files changed, 94 insertions(+), 103 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 3bc2f69..3ea1632 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -213,7 +213,7 @@ static inline struct d3drm *impl_from_IDirect3DRM3(IDirect3DRM3 *iface) static void d3drm_destroy(struct d3drm *d3drm) { - HeapFree(GetProcessHeap(), 0, d3drm); + heap_free(d3drm); TRACE("d3drm object %p is being destroyed.\n", d3drm); } @@ -2308,7 +2308,7 @@ HRESULT WINAPI Direct3DRMCreate(IDirect3DRM **d3drm) TRACE("d3drm %p.\n", d3drm); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRM_iface.lpVtbl = &d3drm1_vtbl; diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index 1bef534..1abfe6f 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -62,8 +62,7 @@ HRESULT d3drm_object_add_destroy_callback(struct d3drm_object *object, D3DRMOBJE if (!cb) return D3DRMERR_BADVALUE; - callback = HeapAlloc(GetProcessHeap(), 0, sizeof(*callback)); - if (!callback) + if (!(callback = heap_alloc(sizeof(*callback)))) return E_OUTOFMEMORY; callback->cb = cb; @@ -85,7 +84,7 @@ HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMO if (callback->cb == cb && callback->ctx == ctx) { list_remove(&callback->entry); - HeapFree(GetProcessHeap(), 0, callback); + heap_free(callback); break; } } @@ -140,13 +139,13 @@ HRESULT d3drm_object_set_name(struct d3drm_object *object, const char *name) { DWORD req_size; - HeapFree(GetProcessHeap(), 0, object->name); + heap_free(object->name); object->name = NULL; if (name) { req_size = strlen(name) + 1; - if (!(object->name = HeapAlloc(GetProcessHeap(), 0, req_size))) + if (!(object->name = heap_alloc(req_size))) return E_OUTOFMEMORY; memcpy(object->name, name, req_size); } @@ -162,9 +161,9 @@ void d3drm_object_cleanup(IDirect3DRMObject *iface, struct d3drm_object *object) { callback->cb(iface, callback->ctx); list_remove(&callback->entry); - HeapFree(GetProcessHeap(), 0, callback); + heap_free(callback); } - HeapFree(GetProcessHeap(), 0, object->name); + heap_free(object->name); object->name = NULL; } diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 65e0016..0f24f80 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -30,6 +30,7 @@ #include "d3drmwin.h" #include "rmxfguid.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #ifndef ARRAY_SIZE diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index c537674..2aa7e48 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -61,7 +61,7 @@ void d3drm_device_destroy(struct d3drm_device *device) IDirectDraw_Release(device->ddraw); IDirect3DRM_Release(device->d3drm); } - HeapFree(GetProcessHeap(), 0, device); + heap_free(device); } static inline struct d3drm_device *impl_from_IDirect3DRMWinDevice(IDirect3DRMWinDevice *iface) @@ -1641,7 +1641,7 @@ HRESULT d3drm_device_create(struct d3drm_device **device, IDirect3DRM *d3drm) TRACE("device %p, d3drm %p.\n", device, d3drm); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMDevice_iface.lpVtbl = &d3drm_device1_vtbl; diff --git a/dlls/d3drm/face.c b/dlls/d3drm/face.c index 95e6e58..324b1de 100644 --- a/dlls/d3drm/face.c +++ b/dlls/d3drm/face.c @@ -82,7 +82,7 @@ static ULONG WINAPI d3drm_face1_Release(IDirect3DRMFace *iface) if (!refcount) { d3drm_object_cleanup((IDirect3DRMObject *)iface, &face->obj); - HeapFree(GetProcessHeap(), 0, face); + heap_free(face); } return refcount; @@ -627,7 +627,7 @@ HRESULT d3drm_face_create(struct d3drm_face **face) TRACE("face %p.\n", face); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMFace_iface.lpVtbl = &d3drm_face1_vtbl; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index aa7633b..11105db 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -141,8 +141,8 @@ static ULONG WINAPI d3drm_frame_array_Release(IDirect3DRMFrameArray *iface) { IDirect3DRMFrame_Release(array->frames[i]); } - HeapFree(GetProcessHeap(), 0, array->frames); - HeapFree(GetProcessHeap(), 0, array); + heap_free(array->frames); + heap_free(array); } return refcount; @@ -193,7 +193,7 @@ static struct d3drm_frame_array *d3drm_frame_array_create(unsigned int frame_cou struct d3drm_frame_array *array; unsigned int i; - if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) + if (!(array = heap_alloc_zero(sizeof(*array)))) return NULL; array->IDirect3DRMFrameArray_iface.lpVtbl = &d3drm_frame_array_vtbl; @@ -202,9 +202,9 @@ static struct d3drm_frame_array *d3drm_frame_array_create(unsigned int frame_cou if (frame_count) { - if (!(array->frames = HeapAlloc(GetProcessHeap(), 0, frame_count * sizeof(*array->frames)))) + if (!(array->frames = heap_calloc(frame_count, sizeof(*array->frames)))) { - HeapFree(GetProcessHeap(), 0, array); + heap_free(array); return NULL; } @@ -259,8 +259,8 @@ static ULONG WINAPI d3drm_visual_array_Release(IDirect3DRMVisualArray *iface) { IDirect3DRMVisual_Release(array->visuals[i]); } - HeapFree(GetProcessHeap(), 0, array->visuals); - HeapFree(GetProcessHeap(), 0, array); + heap_free(array->visuals); + heap_free(array); } return refcount; @@ -311,7 +311,7 @@ static struct d3drm_visual_array *d3drm_visual_array_create(unsigned int visual_ struct d3drm_visual_array *array; unsigned int i; - if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) + if (!(array = heap_alloc_zero(sizeof(*array)))) return NULL; array->IDirect3DRMVisualArray_iface.lpVtbl = &d3drm_visual_array_vtbl; @@ -320,9 +320,9 @@ static struct d3drm_visual_array *d3drm_visual_array_create(unsigned int visual_ if (visual_count) { - if (!(array->visuals = HeapAlloc(GetProcessHeap(), 0, visual_count * sizeof(*array->visuals)))) + if (!(array->visuals = heap_calloc(visual_count, sizeof(*array->visuals)))) { - HeapFree(GetProcessHeap(), 0, array); + heap_free(array); return NULL; } @@ -378,8 +378,8 @@ static ULONG WINAPI d3drm_light_array_Release(IDirect3DRMLightArray *iface) { IDirect3DRMLight_Release(array->lights[i]); } - HeapFree(GetProcessHeap(), 0, array->lights); - HeapFree(GetProcessHeap(), 0, array); + heap_free(array->lights); + heap_free(array); } return refcount; @@ -430,7 +430,7 @@ static struct d3drm_light_array *d3drm_light_array_create(unsigned int light_cou struct d3drm_light_array *array; unsigned int i; - if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) + if (!(array = heap_alloc_zero(sizeof(*array)))) return NULL; array->IDirect3DRMLightArray_iface.lpVtbl = &d3drm_light_array_vtbl; @@ -439,9 +439,9 @@ static struct d3drm_light_array *d3drm_light_array_create(unsigned int light_cou if (light_count) { - if (!(array->lights = HeapAlloc(GetProcessHeap(), 0, light_count * sizeof(*array->lights)))) + if (!(array->lights = heap_calloc(light_count, sizeof(*array->lights)))) { - HeapFree(GetProcessHeap(), 0, array); + heap_free(array); return NULL; } @@ -548,19 +548,19 @@ static ULONG WINAPI d3drm_frame3_Release(IDirect3DRMFrame3 *iface) { IDirect3DRMFrame3_Release(frame->children[i]); } - HeapFree(GetProcessHeap(), 0, frame->children); + heap_free(frame->children); for (i = 0; i < frame->nb_visuals; ++i) { IDirect3DRMVisual_Release(frame->visuals[i]); } - HeapFree(GetProcessHeap(), 0, frame->visuals); + heap_free(frame->visuals); for (i = 0; i < frame->nb_lights; ++i) { IDirect3DRMLight_Release(frame->lights[i]); } - HeapFree(GetProcessHeap(), 0, frame->lights); + heap_free(frame->lights); IDirect3DRM_Release(frame->d3drm); - HeapFree(GetProcessHeap(), 0, frame); + heap_free(frame); } return refcount; @@ -2940,7 +2940,7 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I TRACE("frame %p, parent_frame %p, d3drm %p.\n", frame, parent_frame, d3drm); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMFrame_iface.lpVtbl = &d3drm_frame1_vtbl; @@ -2961,7 +2961,7 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I if (FAILED(hr = IDirect3DRMFrame_QueryInterface(parent_frame, &IID_IDirect3DRMFrame3, (void **)&p))) { - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } IDirect3DRMFrame_Release(parent_frame); @@ -3038,10 +3038,10 @@ static ULONG WINAPI d3drm_animation2_Release(IDirect3DRMAnimation2 *iface) { d3drm_object_cleanup((IDirect3DRMObject *)&animation->IDirect3DRMAnimation_iface, &animation->obj); IDirect3DRM_Release(animation->d3drm); - HeapFree(GetProcessHeap(), 0, animation->rotate.keys); - HeapFree(GetProcessHeap(), 0, animation->scale.keys); - HeapFree(GetProcessHeap(), 0, animation->position.keys); - HeapFree(GetProcessHeap(), 0, animation); + heap_free(animation->rotate.keys); + heap_free(animation->scale.keys); + heap_free(animation->position.keys); + heap_free(animation); } return refcount; @@ -3692,7 +3692,7 @@ HRESULT d3drm_animation_create(struct d3drm_animation **animation, IDirect3DRM * TRACE("animation %p, d3drm %p.\n", animation, d3drm); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMAnimation_iface.lpVtbl = &d3drm_animation1_vtbl; diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 855209f..e31c026 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -70,7 +70,7 @@ static ULONG WINAPI d3drm_light_Release(IDirect3DRMLight *iface) { d3drm_object_cleanup((IDirect3DRMObject *)iface, &light->obj); IDirect3DRM_Release(light->d3drm); - HeapFree(GetProcessHeap(), 0, light); + heap_free(light); } return refcount; @@ -378,7 +378,7 @@ HRESULT d3drm_light_create(struct d3drm_light **light, IDirect3DRM *d3drm) TRACE("light %p.\n", light); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMLight_iface.lpVtbl = &d3drm_light_vtbl; diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index d13b0dd..62acb5a 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -71,7 +71,7 @@ static ULONG WINAPI d3drm_material_Release(IDirect3DRMMaterial2 *iface) { d3drm_object_cleanup((IDirect3DRMObject *)iface, &material->obj); IDirect3DRM_Release(material->d3drm); - HeapFree(GetProcessHeap(), 0, material); + heap_free(material); } return refcount; @@ -286,7 +286,7 @@ HRESULT d3drm_material_create(struct d3drm_material **material, IDirect3DRM *d3d TRACE("material %p, d3drm %p.\n", material, d3drm); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMMaterial2_iface.lpVtbl = &d3drm_material_vtbl; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c95cb46..0090555 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -279,12 +279,7 @@ BOOL d3drm_array_reserve(void **elements, SIZE_T *capacity, SIZE_T element_count if (new_capacity < element_count) new_capacity = max_capacity; - if (*elements) - new_elements = HeapReAlloc(GetProcessHeap(), 0, *elements, new_capacity * element_size); - else - new_elements = HeapAlloc(GetProcessHeap(), 0, new_capacity * element_size); - - if (!new_elements) + if (!(new_elements = heap_realloc(*elements, new_capacity * element_size))) return FALSE; *elements = new_elements; @@ -317,19 +312,19 @@ static void clean_mesh_builder_data(struct d3drm_mesh_builder *mesh_builder) DWORD i; IDirect3DRMMeshBuilder3_SetName(&mesh_builder->IDirect3DRMMeshBuilder3_iface, NULL); - HeapFree(GetProcessHeap(), 0, mesh_builder->vertices); + heap_free(mesh_builder->vertices); mesh_builder->vertices = NULL; mesh_builder->nb_vertices = 0; mesh_builder->vertices_size = 0; - HeapFree(GetProcessHeap(), 0, mesh_builder->normals); + heap_free(mesh_builder->normals); mesh_builder->normals = NULL; mesh_builder->nb_normals = 0; mesh_builder->normals_size = 0; - HeapFree(GetProcessHeap(), 0, mesh_builder->pFaceData); + heap_free(mesh_builder->pFaceData); mesh_builder->pFaceData = NULL; mesh_builder->face_data_size = 0; mesh_builder->nb_faces = 0; - HeapFree(GetProcessHeap(), 0, mesh_builder->pCoords2d); + heap_free(mesh_builder->pCoords2d); mesh_builder->pCoords2d = NULL; mesh_builder->nb_coords2d = 0; for (i = 0; i < mesh_builder->nb_materials; i++) @@ -340,9 +335,9 @@ static void clean_mesh_builder_data(struct d3drm_mesh_builder *mesh_builder) IDirect3DRMTexture3_Release(mesh_builder->materials[i].texture); } mesh_builder->nb_materials = 0; - HeapFree(GetProcessHeap(), 0, mesh_builder->materials); + heap_free(mesh_builder->materials); mesh_builder->materials = NULL; - HeapFree(GetProcessHeap(), 0, mesh_builder->material_indices); + heap_free(mesh_builder->material_indices); mesh_builder->material_indices = NULL; } @@ -401,7 +396,7 @@ static ULONG WINAPI d3drm_mesh_builder2_Release(IDirect3DRMMeshBuilder2 *iface) if (mesh_builder->texture) IDirect3DRMTexture3_Release(mesh_builder->texture); IDirect3DRM_Release(mesh_builder->d3drm); - HeapFree(GetProcessHeap(), 0, mesh_builder); + heap_free(mesh_builder); } return refcount; @@ -1050,13 +1045,14 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, return hr; if (size) { - char *name = HeapAlloc(GetProcessHeap(), 0, size); - if (!name) + char *name; + + if (!(name = heap_alloc(size))) return E_OUTOFMEMORY; if (SUCCEEDED(hr = IDirectXFileData_GetName(pData, name, &size))) IDirect3DRMMeshBuilder3_SetName(iface, name); - HeapFree(GetProcessHeap(), 0, name); + heap_free(name); if (hr != DXFILE_OK) return hr; } @@ -1084,12 +1080,12 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, } memcpy(mesh_builder->vertices, ptr + sizeof(DWORD), mesh_builder->nb_vertices * sizeof(D3DVECTOR)); - faces_vertex_idx_ptr = faces_vertex_idx_data = HeapAlloc(GetProcessHeap(), 0, faces_vertex_idx_size); + faces_vertex_idx_ptr = faces_vertex_idx_data = heap_alloc(faces_vertex_idx_size); memcpy(faces_vertex_idx_data, ptr + sizeof(DWORD) + mesh_builder->nb_vertices * sizeof(D3DVECTOR) + sizeof(DWORD), faces_vertex_idx_size); /* Each vertex index will have its normal index counterpart so just allocate twice the size */ - mesh_builder->pFaceData = HeapAlloc(GetProcessHeap(), 0, faces_vertex_idx_size * 2); + mesh_builder->pFaceData = heap_alloc(faces_vertex_idx_size * 2); faces_data_ptr = (DWORD*)mesh_builder->pFaceData; while (1) @@ -1141,8 +1137,9 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, memcpy(mesh_builder->normals, ptr + sizeof(DWORD), mesh_builder->nb_normals * sizeof(D3DVECTOR)); faces_normal_idx_size = size - (2 * sizeof(DWORD) + mesh_builder->nb_normals * sizeof(D3DVECTOR)); - faces_normal_idx_ptr = faces_normal_idx_data = HeapAlloc(GetProcessHeap(), 0, faces_normal_idx_size); - memcpy(faces_normal_idx_data, ptr + sizeof(DWORD) + mesh_builder->nb_normals * sizeof(D3DVECTOR) + sizeof(DWORD), faces_normal_idx_size); + faces_normal_idx_ptr = faces_normal_idx_data = heap_alloc(faces_normal_idx_size); + memcpy(faces_normal_idx_data, ptr + sizeof(DWORD) + mesh_builder->nb_normals * sizeof(D3DVECTOR) + + sizeof(DWORD), faces_normal_idx_size); } else if (IsEqualGUID(guid, &TID_D3DRMMeshTextureCoords)) { @@ -1154,7 +1151,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, TRACE("MeshTextureCoords: nb_coords2d = %d\n", mesh_builder->nb_coords2d); - mesh_builder->pCoords2d = HeapAlloc(GetProcessHeap(), 0, mesh_builder->nb_coords2d * sizeof(*mesh_builder->pCoords2d)); + mesh_builder->pCoords2d = heap_calloc(mesh_builder->nb_coords2d, sizeof(*mesh_builder->pCoords2d)); memcpy(mesh_builder->pCoords2d, ptr + sizeof(DWORD), mesh_builder->nb_coords2d * sizeof(*mesh_builder->pCoords2d)); } else if (IsEqualGUID(guid, &TID_D3DRMMeshMaterialList)) @@ -1182,15 +1179,15 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, if (size != data_size) WARN("Returned size %u does not match expected one %u\n", size, data_size); - mesh_builder->material_indices = HeapAlloc(GetProcessHeap(), 0, sizeof(*mesh_builder->material_indices) * nb_face_indices); - if (!mesh_builder->material_indices) + if (!(mesh_builder->material_indices = heap_calloc(nb_face_indices, + sizeof(*mesh_builder->material_indices)))) goto end; - memcpy(mesh_builder->material_indices, ptr + 2 * sizeof(DWORD), sizeof(*mesh_builder->material_indices) * nb_face_indices), + memcpy(mesh_builder->material_indices, ptr + 2 * sizeof(DWORD), + nb_face_indices * sizeof(*mesh_builder->material_indices)); - mesh_builder->materials = HeapAlloc(GetProcessHeap(), 0, sizeof(*mesh_builder->materials) * nb_materials); - if (!mesh_builder->materials) + if (!(mesh_builder->materials = heap_calloc(nb_materials, sizeof(*mesh_builder->materials)))) { - HeapFree(GetProcessHeap(), 0, mesh_builder->material_indices); + heap_free(mesh_builder->material_indices); goto end; } mesh_builder->nb_materials = nb_materials; @@ -1442,8 +1439,8 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, if (!mesh_builder->pCoords2d) { mesh_builder->nb_coords2d = mesh_builder->nb_vertices; - mesh_builder->pCoords2d = HeapAlloc(GetProcessHeap(), 0, mesh_builder->nb_coords2d * sizeof(*mesh_builder->pCoords2d)); - for (i = 0; i < mesh_builder->nb_coords2d; i++) + mesh_builder->pCoords2d = heap_calloc(mesh_builder->nb_coords2d, sizeof(*mesh_builder->pCoords2d)); + for (i = 0; i < mesh_builder->nb_coords2d; ++i) { mesh_builder->pCoords2d[i].u = 0.0f; mesh_builder->pCoords2d[i].v = 0.0f; @@ -1456,8 +1453,8 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, end: - HeapFree(GetProcessHeap(), 0, faces_normal_idx_data); - HeapFree(GetProcessHeap(), 0, faces_vertex_idx_data); + heap_free(faces_normal_idx_data); + heap_free(faces_vertex_idx_data); return ret; } @@ -1970,8 +1967,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateMesh(IDirect3DRMMeshBuilder3 *if int k; D3DRMVERTEX* vertices; - vertices = HeapAlloc(GetProcessHeap(), 0, mesh_builder->nb_vertices * sizeof(D3DRMVERTEX)); - if (!vertices) + if (!(vertices = heap_calloc(mesh_builder->nb_vertices, sizeof(*vertices)))) { IDirect3DRMMesh_Release(*mesh); return E_OUTOFMEMORY; @@ -1979,7 +1975,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateMesh(IDirect3DRMMeshBuilder3 *if for (i = 0; i < mesh_builder->nb_vertices; i++) vertices[i].position = mesh_builder->vertices[i]; hr = IDirect3DRMMesh_SetVertices(*mesh, 0, 0, mesh_builder->nb_vertices, vertices); - HeapFree(GetProcessHeap(), 0, vertices); + heap_free(vertices); /* Groups are in reverse order compared to materials list in X file */ for (k = mesh_builder->nb_materials - 1; k >= 0; k--) @@ -1992,17 +1988,15 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateMesh(IDirect3DRMMeshBuilder3 *if unsigned nb_vertices = 0; unsigned nb_faces = 0; - used_vertices = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mesh_builder->face_data_size * sizeof(*used_vertices)); - if (!used_vertices) + if (!(used_vertices = heap_calloc(mesh_builder->face_data_size, sizeof(*used_vertices)))) { IDirect3DRMMesh_Release(*mesh); return E_OUTOFMEMORY; } - face_data = HeapAlloc(GetProcessHeap(), 0, mesh_builder->face_data_size * sizeof(*face_data)); - if (!face_data) + if (!(face_data = heap_calloc(mesh_builder->face_data_size, sizeof(*face_data)))) { - HeapFree(GetProcessHeap(), 0, used_vertices); + heap_free(used_vertices); IDirect3DRMMesh_Release(*mesh); return E_OUTOFMEMORY; } @@ -2056,8 +2050,8 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateMesh(IDirect3DRMMeshBuilder3 *if nb_vertices++; hr = IDirect3DRMMesh_AddGroup(*mesh, nb_vertices, nb_faces, vertex_per_face, face_data, &group); - HeapFree(GetProcessHeap(), 0, used_vertices); - HeapFree(GetProcessHeap(), 0, face_data); + heap_free(used_vertices); + heap_free(face_data); if (SUCCEEDED(hr)) hr = IDirect3DRMMesh_SetGroupColor(*mesh, group, mesh_builder->materials[k].color); if (SUCCEEDED(hr)) @@ -2347,7 +2341,7 @@ HRESULT d3drm_mesh_builder_create(struct d3drm_mesh_builder **mesh_builder, IDir TRACE("mesh_builder %p.\n", mesh_builder); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMMeshBuilder2_iface.lpVtbl = &d3drm_mesh_builder2_vtbl; @@ -2408,15 +2402,15 @@ static ULONG WINAPI d3drm_mesh_Release(IDirect3DRMMesh *iface) IDirect3DRM_Release(mesh->d3drm); for (i = 0; i < mesh->nb_groups; ++i) { - HeapFree(GetProcessHeap(), 0, mesh->groups[i].vertices); - HeapFree(GetProcessHeap(), 0, mesh->groups[i].face_data); + heap_free(mesh->groups[i].vertices); + heap_free(mesh->groups[i].face_data); if (mesh->groups[i].material) IDirect3DRMMaterial2_Release(mesh->groups[i].material); if (mesh->groups[i].texture) IDirect3DRMTexture3_Release(mesh->groups[i].texture); } - HeapFree(GetProcessHeap(), 0, mesh->groups); - HeapFree(GetProcessHeap(), 0, mesh); + heap_free(mesh->groups); + heap_free(mesh); } return refcount; @@ -2537,8 +2531,7 @@ static HRESULT WINAPI d3drm_mesh_AddGroup(IDirect3DRMMesh *iface, unsigned verte group = mesh->groups + mesh->nb_groups; - group->vertices = HeapAlloc(GetProcessHeap(), 0, vertex_count * sizeof(D3DRMVERTEX)); - if (!group->vertices) + if (!(group->vertices = heap_calloc(vertex_count, sizeof(*group->vertices)))) return E_OUTOFMEMORY; group->nb_vertices = vertex_count; group->nb_faces = face_count; @@ -2563,14 +2556,12 @@ static HRESULT WINAPI d3drm_mesh_AddGroup(IDirect3DRMMesh *iface, unsigned verte } } - group->face_data = HeapAlloc(GetProcessHeap(), 0, group->face_data_size * sizeof(unsigned)); - if (!group->face_data) + if (!(group->face_data = heap_calloc(group->face_data_size, sizeof(*group->face_data)))) { - HeapFree(GetProcessHeap(), 0 , group->vertices); + heap_free(group->vertices); return E_OUTOFMEMORY; } - - memcpy(group->face_data, face_data, group->face_data_size * sizeof(unsigned)); + memcpy(group->face_data, face_data, group->face_data_size * sizeof(*face_data)); group->material = NULL; group->texture = NULL; @@ -2849,7 +2840,7 @@ HRESULT d3drm_mesh_create(struct d3drm_mesh **mesh, IDirect3DRM *d3drm) TRACE("mesh %p, d3drm %p.\n", mesh, d3drm); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMMesh_iface.lpVtbl = &d3drm_mesh_vtbl; @@ -2903,7 +2894,7 @@ static ULONG WINAPI d3drm_wrap_Release(IDirect3DRMWrap *iface) if (!refcount) { d3drm_object_cleanup((IDirect3DRMObject *)iface, &wrap->obj); - HeapFree(GetProcessHeap(), 0, wrap); + heap_free(wrap); } return refcount; @@ -3035,7 +3026,7 @@ HRESULT d3drm_wrap_create(struct d3drm_wrap **wrap, IDirect3DRM *d3drm) TRACE("wrap %p, d3drm %p.\n", wrap, d3drm); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMWrap_iface.lpVtbl = &d3drm_wrap_vtbl; diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index d03fee7..fd56e76 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -49,7 +49,7 @@ static void d3drm_texture_destroy(struct d3drm_texture *texture) IDirect3DRM_Release(texture->d3drm); if (texture->surface) IDirectDrawSurface_Release(texture->surface); - HeapFree(GetProcessHeap(), 0, texture); + heap_free(texture); } static BOOL d3drm_validate_image(D3DRMIMAGE *image) @@ -1119,7 +1119,7 @@ HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) TRACE("texture %p.\n", texture); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMTexture_iface.lpVtbl = &d3drm_texture1_vtbl; diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index a85d00f..37c70c8 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -75,7 +75,7 @@ static void d3drm_viewport_destroy(struct d3drm_viewport *viewport) IDirect3DRM_Release(viewport->d3drm); } - HeapFree(GetProcessHeap(), 0, viewport); + heap_free(viewport); } static HRESULT WINAPI d3drm_viewport2_QueryInterface(IDirect3DRMViewport2 *iface, REFIID riid, void **out) @@ -1022,7 +1022,7 @@ HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3d TRACE("viewport %p, d3drm %p.\n", viewport, d3drm); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMViewport_iface.lpVtbl = &d3drm_viewport1_vtbl; -- 2.1.4

1 0

[PATCH 4/5] wined3d: Explicitly check for dynamic usage in wined3d_texture_use_pbo().
by Henri Verbeet 08 Feb '18

08 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ed1ca21..116b8db 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -32,8 +32,8 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) { - return (texture->resource.access & (WINED3D_RESOURCE_ACCESS_CPU - | WINED3D_RESOURCE_ACCESS_MAP)) == WINED3D_RESOURCE_ACCESS_MAP + return !(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) + && texture->resource.usage & WINED3DUSAGE_DYNAMIC && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && !texture->resource.format->conv_byte_count && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED)); -- 2.1.4

1 0

[PATCH 3/5] wined3d: Update the depth/stencil resource location for stencil clears as well.
by Henri Verbeet 08 Feb '18

08 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 78610fc..7881bca 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -288,16 +288,22 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c depth_stencil->texture_level); } - if (depth_stencil && render_offscreen) - wined3d_texture_prepare_location(depth_stencil->container, - dsv->sub_resource_idx, context, dsv->resource->draw_binding); - - if (flags & WINED3DCLEAR_ZBUFFER) + if (depth_stencil) { - DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; + DWORD ds_location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; + struct wined3d_texture *ds = wined3d_texture_from_resource(dsv->resource); + + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) + && !is_full_clear(depth_stencil, draw_rect, rect_count ? clear_rect : NULL)) + wined3d_texture_load_location(ds, dsv->sub_resource_idx, context, ds_location); + else + wined3d_texture_prepare_location(ds, dsv->sub_resource_idx, context, ds_location); - wined3d_texture_load_location(depth_stencil->container, - dsv->sub_resource_idx, context, location); + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + { + wined3d_texture_validate_location(ds, dsv->sub_resource_idx, ds_location); + wined3d_texture_invalidate_location(ds, dsv->sub_resource_idx, ~ds_location); + } } if (!context_apply_clear_state(context, state, rt_count, fb)) @@ -324,11 +330,6 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (flags & WINED3DCLEAR_ZBUFFER) { - DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - - wined3d_texture_validate_location(depth_stencil->container, dsv->sub_resource_idx, location); - wined3d_texture_invalidate_location(depth_stencil->container, dsv->sub_resource_idx, ~location); - gl_info->gl_ops.gl.p_glDepthMask(GL_TRUE); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ZWRITEENABLE)); gl_info->gl_ops.gl.p_glClearDepth(depth); -- 2.1.4

1 0

[PATCH 2/5] wined3d: Get rid of wined3d_get_draw_rect().
by Henri Verbeet 08 Feb '18

08 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/utils.c | 10 ---------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 76316e0..ed249f4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -501,14 +501,11 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) { - const struct wined3d_state *state = &cs->state; const struct wined3d_cs_clear *op = data; struct wined3d_device *device; unsigned int i; - RECT draw_rect; device = cs->device; - wined3d_get_draw_rect(state, &draw_rect); device->blitter->ops->blitter_clear(device->blitter, device, op->rt_count, op->fb, op->rect_count, op->rects, &op->draw_rect, op->flags, &op->color, op->depth, op->stencil); @@ -529,6 +526,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * { unsigned int rt_count = cs->device->adapter->gl_info.limits.buffers; const struct wined3d_state *state = &cs->device->state; + const struct wined3d_viewport *vp = &state->viewport; struct wined3d_cs_clear *op; unsigned int i; @@ -538,7 +536,9 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->flags = flags; op->rt_count = rt_count; op->fb = &cs->fb; - wined3d_get_draw_rect(state, &op->draw_rect); + SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); + if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) + IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rect); op->color = *color; op->depth = depth; op->stencil = stencil; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a31baa4..48f72fe 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5990,16 +5990,6 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb return memcmp(ka, kb, sizeof(*ka)); } -void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) -{ - const struct wined3d_viewport *vp = &state->viewport; - - SetRect(rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); - - if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) - IntersectRect(rect, rect, &state->scissor_rect); -} - const char *wined3d_debug_location(DWORD location) { const char *prefix = ""; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e2527f2..bf17a1c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2695,7 +2695,6 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, const struct ffp_frag_settings *settings) DECLSPEC_HIDDEN; void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc) DECLSPEC_HIDDEN; -void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) DECLSPEC_HIDDEN; void wined3d_ftoa(float value, char *s) DECLSPEC_HIDDEN; extern const float wined3d_srgb_const0[] DECLSPEC_HIDDEN; -- 2.1.4

1 0

[PATCH 1/5] d3d9: Use wined3d_buffer_create() in d3d9_device_prepare_vertex_buffer().
by Henri Verbeet 08 Feb '18

08 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 15 +++++++++++---- dlls/wined3d/buffer.c | 46 ---------------------------------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 10 ---------- 4 files changed, 11 insertions(+), 61 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9dd58a3..3bd23b6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2543,15 +2543,22 @@ static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UIN if (device->vertex_buffer_size < min_size || !device->vertex_buffer) { UINT size = max(device->vertex_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing vertex buffer to %u bytes.\n", size); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &d3d9_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x.\n", device, hr); + ERR("Failed to create vertex buffer, hr %#x.\n", hr); return hr; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f1b4556..f907ece 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1441,49 +1441,3 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct return WINED3D_OK; } - -static DWORD resource_access_from_pool(enum wined3d_pool pool) -{ - switch (pool) - { - case WINED3D_POOL_DEFAULT: - return WINED3D_RESOURCE_ACCESS_GPU; - - case WINED3D_POOL_MANAGED: - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; - - case WINED3D_POOL_SYSTEM_MEM: - return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; - - default: - FIXME("Unhandled pool %#x.\n", pool); - return 0; - } -} - -HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, DWORD usage, enum wined3d_pool pool, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) -{ - struct wined3d_buffer_desc desc; - - TRACE("device %p, size %u, usage %#x, pool %#x, parent %p, parent_ops %p, buffer %p.\n", - device, size, usage, pool, parent, parent_ops, buffer); - - if (usage & WINED3DUSAGE_SCRATCH) - { - /* The d3d9 tests shows that this is not allowed. It doesn't make much - * sense anyway, SCRATCH buffers wouldn't be usable anywhere. */ - WARN("Vertex buffer with WINED3DUSAGE_SCRATCH requested, returning WINED3DERR_INVALIDCALL.\n"); - *buffer = NULL; - return WINED3DERR_INVALIDCALL; - } - - desc.byte_width = size; - desc.usage = usage; - desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = resource_access_from_pool(pool); - desc.misc_flags = 0; - desc.structure_byte_stride = 0; - - return wined3d_buffer_create(device, &desc, NULL, parent, parent_ops, buffer); -} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f65cc85..7c1b5e3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -28,7 +28,6 @@ @ cdecl wined3d_blend_state_incref(ptr) @ cdecl wined3d_buffer_create(ptr ptr ptr ptr ptr ptr) -@ cdecl wined3d_buffer_create_vb(ptr long long long ptr ptr ptr) @ cdecl wined3d_buffer_decref(ptr) @ cdecl wined3d_buffer_get_parent(ptr) @ cdecl wined3d_buffer_get_resource(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f6ffdba..9d551d8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -680,13 +680,6 @@ enum wined3d_resource_type WINED3D_RTYPE_TEXTURE_3D = 3, }; -enum wined3d_pool -{ - WINED3D_POOL_DEFAULT = 0, - WINED3D_POOL_MANAGED = 1, - WINED3D_POOL_SYSTEM_MEM = 2, -}; - enum wined3d_query_type { WINED3D_QUERY_TYPE_VCACHE = 4, @@ -2195,9 +2188,6 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); -HRESULT __cdecl wined3d_buffer_create_vb(struct wined3d_device *device, UINT length, DWORD usage, - enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_buffer **buffer); ULONG __cdecl wined3d_buffer_decref(struct wined3d_buffer *buffer); void * __cdecl wined3d_buffer_get_parent(const struct wined3d_buffer *buffer); struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buffer *buffer); -- 2.1.4

1 0

[PATCH 7/7] mshtml/tests: Run form element tests in both quirks and IE9 compat mode.
by Jacek Caban 08 Feb '18

08 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 95 ++++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 36 deletions(-)

1 0

[PATCH 6/7] mshtml: Fixed error handling in IHTMLElementCollection::item in IE9+ mode.
by Jacek Caban 08 Feb '18

08 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelemcol.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)

1 0