Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-01 23:14:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Check if translated / untranslated resource list is empty

Browse source 
- If both are empty, create an empty resource list
- May fix a crash with Yamaha XG Pci 

svn path=/trunk/; revision=42438
This commit is contained in:
Johannes Anderwald 2009-08-06 20:44:53 +00:00
parent cb95320734
commit ba99294c86
1 changed files with 46 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
reactos/drivers/wdm/audio/backpln/portcls/resource.c
View file

@ -351,13 +351,31 @@ PcNewResourceList(
IN PCM_RESOURCE_LIST UntranslatedResourceList)
{
PCM_RESOURCE_LIST NewUntranslatedResources, NewTranslatedResources;
ULONG NewTranslatedSize, NewUntranslatedSize;
ULONG NewTranslatedSize, NewUntranslatedSize, ResourceCount;
IResourceListImpl* NewList;
/* TODO: Validate parameters */
if (!TranslatedResourceList)
{
/* if the untranslated resource list is also not provided, it becomes an empty resource list */
if (UntranslatedResourceList)
{
/* invalid parameter mix */
return STATUS_INVALID_PARAMETER;
}
}
else
{
/* if the translated resource list is also not provided, it becomes an empty resource list */
if (!UntranslatedResourceList)
{
/* invalid parameter mix */
return STATUS_INVALID_PARAMETER;
}
}
/* allocate resource list ctx */
NewList = AllocateItem(PoolType, sizeof(IResourceListImpl), TAG_PORTCLASS);
/* check for success */
if (!NewList)
{
DPRINT("AllocateItem failed\n");
@ -365,11 +383,27 @@ PcNewResourceList(
}
/* Initialize */
NewList->lpVtbl = (IResourceListVtbl*)&vt_ResourceListVtbl;
NewList->ref = 1;
NewList->OuterUnknown = OuterUnknown;
NewList->PoolType = PoolType;
NewTranslatedSize = sizeof(CM_RESOURCE_LIST);
if (TranslatedResourceList[0].List->PartialResourceList.Count > 1)
NewTranslatedSize += (TranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
if (!TranslatedResourceList || !UntranslatedResourceList)
{
/* empty resource list */
*OutResourceList = (IResourceList*)&NewList->lpVtbl;
return STATUS_SUCCESS;
}
/* calculate translated resource list size */
ResourceCount = TranslatedResourceList->List[0].PartialResourceList.Count;
NewTranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]);
/* calculate untranslated resouce list size */
ResourceCount = UntranslatedResourceList->List[0].PartialResourceList.Count;
NewUntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]);
/* allocate translated resource list */
NewTranslatedResources = AllocateItem(PoolType, NewTranslatedSize, TAG_PORTCLASS);
if (!NewTranslatedResources)
{
@ -377,10 +411,7 @@ PcNewResourceList(
return STATUS_INSUFFICIENT_RESOURCES;
}
NewUntranslatedSize = sizeof(CM_RESOURCE_LIST);
if (UntranslatedResourceList[0].List->PartialResourceList.Count > 1)
NewUntranslatedSize += (UntranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
/* allocate untranslated resource list */
NewUntranslatedResources = AllocateItem(PoolType, NewUntranslatedSize, TAG_PORTCLASS);
if (!NewUntranslatedResources)
{
@ -389,15 +420,13 @@ PcNewResourceList(
return STATUS_INSUFFICIENT_RESOURCES;
}
/* copy resource lists */
RtlCopyMemory(NewTranslatedResources, TranslatedResourceList, NewTranslatedSize);
RtlCopyMemory(NewUntranslatedResources, UntranslatedResourceList, NewUntranslatedSize);
NewList->lpVtbl = (IResourceListVtbl*)&vt_ResourceListVtbl;
NewList->ref = 1;
NewList->OuterUnknown = OuterUnknown;
/* store resource lists */
NewList->TranslatedResourceList= NewTranslatedResources;
NewList->UntranslatedResourceList = NewUntranslatedResources;
NewList->PoolType = PoolType;
/* Increment our usage count and set the pointer to this object */
*OutResourceList = (IResourceList*)&NewList->lpVtbl;
@ -405,7 +434,9 @@ PcNewResourceList(
return STATUS_SUCCESS;
}
PORTCLASSAPI NTSTATUS NTAPI
PORTCLASSAPI
NTSTATUS
NTAPI
PcNewResourceSublist(
OUT PRESOURCELIST* OutResourceList,
IN PUNKNOWN OuterUnknown OPTIONAL,