wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 0799550075654094a3bed080aac722b9bea01307

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2018-09-14 08:10:33 +10:00
parent d4710fd098
commit 5d3992d777
7 changed files with 1 additions and 1092 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

335
patches/mfplat-MFCreateSample/0002-mfplat-Forward-IMFStreamDescriptor-to-IMFAttributes.patch
View File

@ -1,335 +0,0 @@
From 5b24c81c4c5146f86ab94de67983ace35b967802 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 24 Aug 2018 09:48:43 +1000
Subject: [PATCH 2/3] mfplat: Forward IMFStreamDescriptor to IMFAttributes
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
---
dlls/mfplat/main.c | 154 ++++++++++-----------------------------------
1 file changed, 33 insertions(+), 121 deletions(-)
diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index 744f074b56..ce5d446bfb 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -1599,6 +1599,7 @@ HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue)
typedef struct _mfdescriptor
{
+ mfattributes attributes;
IMFStreamDescriptor IMFStreamDescriptor_iface;
LONG ref;
} mfdescriptor;
@@ -1659,269 +1660,179 @@ static ULONG WINAPI mfdescriptor_Release(IMFStreamDescriptor *iface)
static HRESULT WINAPI mfdescriptor_GetItem(IMFStreamDescriptor *iface, REFGUID key, PROPVARIANT *value)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p\n", This, debugstr_guid(key), value);
-
- return E_NOTIMPL;
+ return IMFAttributes_GetItem(&This->attributes.IMFAttributes_iface, key, value);
}
static HRESULT WINAPI mfdescriptor_GetItemType(IMFStreamDescriptor *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p\n", This, debugstr_guid(key), type);
-
- return E_NOTIMPL;
+ return IMFAttributes_GetItemType(&This->attributes.IMFAttributes_iface, key, type);
}
static HRESULT WINAPI mfdescriptor_CompareItem(IMFStreamDescriptor *iface, REFGUID key, REFPROPVARIANT value, BOOL *result)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), value, result);
-
- return E_NOTIMPL;
+ return IMFAttributes_CompareItem(&This->attributes.IMFAttributes_iface, key, value, result);
}
static HRESULT WINAPI mfdescriptor_Compare(IMFStreamDescriptor *iface, IMFAttributes *theirs, MF_ATTRIBUTES_MATCH_TYPE type,
BOOL *result)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %p, %d, %p\n", This, theirs, type, result);
-
- return E_NOTIMPL;
+ return IMFAttributes_Compare(&This->attributes.IMFAttributes_iface, theirs, type, result);
}
static HRESULT WINAPI mfdescriptor_GetUINT32(IMFStreamDescriptor *iface, REFGUID key, UINT32 *value)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p\n", This, debugstr_guid(key), value);
-
- return E_NOTIMPL;
+ return IMFAttributes_GetUINT32(&This->attributes.IMFAttributes_iface, key, value);
}
static HRESULT WINAPI mfdescriptor_GetUINT64(IMFStreamDescriptor *iface, REFGUID key, UINT64 *value)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p\n", This, debugstr_guid(key), value);
-
- return E_NOTIMPL;
+ return IMFAttributes_GetUINT64(&This->attributes.IMFAttributes_iface, key, value);
}
static HRESULT WINAPI mfdescriptor_GetDouble(IMFStreamDescriptor *iface, REFGUID key, double *value)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p\n", This, debugstr_guid(key), value);
-
- return E_NOTIMPL;
+ return IMFAttributes_GetDouble(&This->attributes.IMFAttributes_iface, key, value);
}
static HRESULT WINAPI mfdescriptor_GetGUID(IMFStreamDescriptor *iface, REFGUID key, GUID *value)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p\n", This, debugstr_guid(key), value);
-
- return E_NOTIMPL;
+ return IMFAttributes_GetGUID(&This->attributes.IMFAttributes_iface, key, value);
}
static HRESULT WINAPI mfdescriptor_GetStringLength(IMFStreamDescriptor *iface, REFGUID key, UINT32 *length)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p\n", This, debugstr_guid(key), length);
-
- return E_NOTIMPL;
+ return IMFAttributes_GetStringLength(&This->attributes.IMFAttributes_iface, key, length);
}
static HRESULT WINAPI mfdescriptor_GetString(IMFStreamDescriptor *iface, REFGUID key, WCHAR *value,
UINT32 size, UINT32 *length)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p, %d, %p\n", This, debugstr_guid(key), value, size, length);
-
- return E_NOTIMPL;
+ return IMFAttributes_GetString(&This->attributes.IMFAttributes_iface, key, value, size, length);
}
static HRESULT WINAPI mfdescriptor_GetAllocatedString(IMFStreamDescriptor *iface, REFGUID key,
WCHAR **value, UINT32 *length)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), value, length);
-
- return E_NOTIMPL;
+ return IMFAttributes_GetAllocatedString(&This->attributes.IMFAttributes_iface, key, value, length);
}
static HRESULT WINAPI mfdescriptor_GetBlobSize(IMFStreamDescriptor *iface, REFGUID key, UINT32 *size)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p\n", This, debugstr_guid(key), size);
-
- return E_NOTIMPL;
+ return IMFAttributes_GetBlobSize(&This->attributes.IMFAttributes_iface, key, size);
}
static HRESULT WINAPI mfdescriptor_GetBlob(IMFStreamDescriptor *iface, REFGUID key, UINT8 *buf,
UINT32 bufsize, UINT32 *blobsize)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p, %d, %p\n", This, debugstr_guid(key), buf, bufsize, blobsize);
-
- return E_NOTIMPL;
+ return IMFAttributes_GetBlob(&This->attributes.IMFAttributes_iface, key, buf, bufsize, blobsize);
}
static HRESULT WINAPI mfdescriptor_GetAllocatedBlob(IMFStreamDescriptor *iface, REFGUID key, UINT8 **buf, UINT32 *size)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), buf, size);
-
- return E_NOTIMPL;
+ return IMFAttributes_GetAllocatedBlob(&This->attributes.IMFAttributes_iface, key, buf, size);
}
static HRESULT WINAPI mfdescriptor_GetUnknown(IMFStreamDescriptor *iface, REFGUID key, REFIID riid, void **ppv)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %s, %p\n", This, debugstr_guid(key), debugstr_guid(riid), ppv);
-
- return E_NOTIMPL;
+ return IMFAttributes_GetUnknown(&This->attributes.IMFAttributes_iface, key, riid, ppv);
}
-static HRESULT WINAPI mfdescriptor_SetItem(IMFStreamDescriptor *iface, REFGUID key, REFPROPVARIANT Value)
+static HRESULT WINAPI mfdescriptor_SetItem(IMFStreamDescriptor *iface, REFGUID key, REFPROPVARIANT value)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p\n", This, debugstr_guid(key), Value);
-
- return E_NOTIMPL;
+ return IMFAttributes_SetItem(&This->attributes.IMFAttributes_iface, key, value);
}
static HRESULT WINAPI mfdescriptor_DeleteItem(IMFStreamDescriptor *iface, REFGUID key)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s\n", This, debugstr_guid(key));
-
- return E_NOTIMPL;
+ return IMFAttributes_DeleteItem(&This->attributes.IMFAttributes_iface, key);
}
static HRESULT WINAPI mfdescriptor_DeleteAllItems(IMFStreamDescriptor *iface)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p\n", This);
-
- return E_NOTIMPL;
+ return IMFAttributes_DeleteAllItems(&This->attributes.IMFAttributes_iface);
}
static HRESULT WINAPI mfdescriptor_SetUINT32(IMFStreamDescriptor *iface, REFGUID key, UINT32 value)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %d\n", This, debugstr_guid(key), value);
-
- return E_NOTIMPL;
+ return IMFAttributes_SetUINT32(&This->attributes.IMFAttributes_iface, key, value);
}
static HRESULT WINAPI mfdescriptor_SetUINT64(IMFStreamDescriptor *iface, REFGUID key, UINT64 value)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %s\n", This, debugstr_guid(key), wine_dbgstr_longlong(value));
-
- return E_NOTIMPL;
+ return IMFAttributes_SetUINT64(&This->attributes.IMFAttributes_iface, key, value);
}
static HRESULT WINAPI mfdescriptor_SetDouble(IMFStreamDescriptor *iface, REFGUID key, double value)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %f\n", This, debugstr_guid(key), value);
-
- return E_NOTIMPL;
+ return IMFAttributes_SetDouble(&This->attributes.IMFAttributes_iface, key, value);
}
static HRESULT WINAPI mfdescriptor_SetGUID(IMFStreamDescriptor *iface, REFGUID key, REFGUID value)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %s\n", This, debugstr_guid(key), debugstr_guid(value));
-
- return E_NOTIMPL;
+ return IMFAttributes_SetGUID(&This->attributes.IMFAttributes_iface, key, value);
}
static HRESULT WINAPI mfdescriptor_SetString(IMFStreamDescriptor *iface, REFGUID key, const WCHAR *value)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %s\n", This, debugstr_guid(key), debugstr_w(value));
-
- return E_NOTIMPL;
+ return IMFAttributes_SetString(&This->attributes.IMFAttributes_iface, key, value);
}
static HRESULT WINAPI mfdescriptor_SetBlob(IMFStreamDescriptor *iface, REFGUID key, const UINT8 *buf, UINT32 size)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p, %d\n", This, debugstr_guid(key), buf, size);
-
- return E_NOTIMPL;
+ return IMFAttributes_SetBlob(&This->attributes.IMFAttributes_iface, key, buf, size);
}
static HRESULT WINAPI mfdescriptor_SetUnknown(IMFStreamDescriptor *iface, REFGUID key, IUnknown *unknown)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %s, %p\n", This, debugstr_guid(key), unknown);
-
- return E_NOTIMPL;
+ return IMFAttributes_SetUnknown(&This->attributes.IMFAttributes_iface, key, unknown);
}
static HRESULT WINAPI mfdescriptor_LockStore(IMFStreamDescriptor *iface)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p\n", This);
-
- return E_NOTIMPL;
+ return IMFAttributes_LockStore(&This->attributes.IMFAttributes_iface);
}
static HRESULT WINAPI mfdescriptor_UnlockStore(IMFStreamDescriptor *iface)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p\n", This);
-
- return E_NOTIMPL;
+ return IMFAttributes_UnlockStore(&This->attributes.IMFAttributes_iface);
}
static HRESULT WINAPI mfdescriptor_GetCount(IMFStreamDescriptor *iface, UINT32 *items)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %p\n", This, items);
-
- if(items)
- *items = 0;
-
- return E_NOTIMPL;
+ return IMFAttributes_GetCount(&This->attributes.IMFAttributes_iface, items);
}
static HRESULT WINAPI mfdescriptor_GetItemByIndex(IMFStreamDescriptor *iface, UINT32 index, GUID *key, PROPVARIANT *value)
{
mfdescriptor *This = impl_from_IMFStreamDescriptor(iface);
-
- FIXME("%p, %d, %p, %p\n", This, index, key, value);
-
- return E_NOTIMPL;
+ return IMFAttributes_GetItemByIndex(&This->attributes.IMFAttributes_iface, index, key, value);
}
static HRESULT WINAPI mfdescriptor_CopyAllItems(IMFStreamDescriptor *iface, IMFAttributes *dest)
@@ -2003,7 +1914,8 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count,
object->ref = 1;
object->IMFStreamDescriptor_iface.lpVtbl = &mfdescriptor_vtbl;
-
+ init_attribute_object(&object->attributes, 0);
*descriptor = &object->IMFStreamDescriptor_iface;
+
return S_OK;
}
--
2.18.0

530
patches/mfplat-MFCreateSample/0003-mfplat-Implement-MFCreateSample.patch
View File

@ -1,530 +0,0 @@
From 7ddeecfd4195dc718f9a74aa5ccd2e3c6589f6b1 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 24 Aug 2018 10:32:26 +1000
Subject: [PATCH 3/3] mfplat: Implement MFCreateSample
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45617
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
---
dlls/mfplat/main.c | 445 +++++++++++++++++++++++++++++++++++++++++++++
dlls/mfplat/mfplat.spec | 2 +-
dlls/mfplat/tests/mfplat.c | 17 ++
include/mfapi.h | 1 +
4 files changed, 464 insertions(+), 1 deletion(-)
diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index 73bc564..771abb3 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -2353,3 +2353,448 @@ HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer)
return S_OK;
}
+
+typedef struct _mfsample
+{
+ mfattributes attributes;
+ IMFSample IMFSample_iface;
+ LONG ref;
+} mfsample;
+
+static inline mfsample *impl_from_IMFSample(IMFSample *iface)
+{
+ return CONTAINING_RECORD(iface, mfsample, IMFSample_iface);
+}
+
+static HRESULT WINAPI mfsample_QueryInterface(IMFSample *iface, REFIID riid, void **out)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out);
+
+ if(IsEqualGUID(riid, &IID_IUnknown) ||
+ IsEqualGUID(riid, &IID_IMFAttributes) ||
+ IsEqualGUID(riid, &IID_IMFSample))
+ {
+ *out = &This->IMFSample_iface;
+ }
+ else
+ {
+ FIXME("(%s, %p)\n", debugstr_guid(riid), out);
+ *out = NULL;
+ return E_NOINTERFACE;
+ }
+
+ IUnknown_AddRef((IUnknown*)*out);
+ return S_OK;
+}
+
+static ULONG WINAPI mfsample_AddRef(IMFSample *iface)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ ULONG ref = InterlockedIncrement(&This->ref);
+
+ TRACE("(%p) ref=%u\n", This, ref);
+
+ return ref;
+}
+
+static ULONG WINAPI mfsample_Release(IMFSample *iface)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ ULONG ref = InterlockedDecrement(&This->ref);
+
+ TRACE("(%p) ref=%u\n", This, ref);
+
+ if (!ref)
+ {
+ HeapFree(GetProcessHeap(), 0, This);
+ }
+
+ return ref;
+}
+
+static HRESULT WINAPI mfsample_GetItem(IMFSample *iface, REFGUID key, PROPVARIANT *value)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetItem(&This->attributes.IMFAttributes_iface, key, value);
+}
+
+static HRESULT WINAPI mfsample_GetItemType(IMFSample *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetItemType(&This->attributes.IMFAttributes_iface, key, type);
+}
+
+static HRESULT WINAPI mfsample_CompareItem(IMFSample *iface, REFGUID key, REFPROPVARIANT value, BOOL *result)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_CompareItem(&This->attributes.IMFAttributes_iface, key, value, result);
+}
+
+static HRESULT WINAPI mfsample_Compare(IMFSample *iface, IMFAttributes *theirs, MF_ATTRIBUTES_MATCH_TYPE type,
+ BOOL *result)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_Compare(&This->attributes.IMFAttributes_iface, theirs, type, result);
+}
+
+static HRESULT WINAPI mfsample_GetUINT32(IMFSample *iface, REFGUID key, UINT32 *value)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetUINT32(&This->attributes.IMFAttributes_iface, key, value);
+}
+
+static HRESULT WINAPI mfsample_GetUINT64(IMFSample *iface, REFGUID key, UINT64 *value)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetUINT64(&This->attributes.IMFAttributes_iface, key, value);
+}
+
+static HRESULT WINAPI mfsample_GetDouble(IMFSample *iface, REFGUID key, double *value)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetDouble(&This->attributes.IMFAttributes_iface, key, value);
+}
+
+static HRESULT WINAPI mfsample_GetGUID(IMFSample *iface, REFGUID key, GUID *value)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetGUID(&This->attributes.IMFAttributes_iface, key, value);
+}
+
+static HRESULT WINAPI mfsample_GetStringLength(IMFSample *iface, REFGUID key, UINT32 *length)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetStringLength(&This->attributes.IMFAttributes_iface, key, length);
+}
+
+static HRESULT WINAPI mfsample_GetString(IMFSample *iface, REFGUID key, WCHAR *value,
+ UINT32 size, UINT32 *length)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetString(&This->attributes.IMFAttributes_iface, key, value, size, length);
+}
+
+static HRESULT WINAPI mfsample_GetAllocatedString(IMFSample *iface, REFGUID key,
+ WCHAR **value, UINT32 *length)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetAllocatedString(&This->attributes.IMFAttributes_iface, key, value, length);
+}
+
+static HRESULT WINAPI mfsample_GetBlobSize(IMFSample *iface, REFGUID key, UINT32 *size)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetBlobSize(&This->attributes.IMFAttributes_iface, key, size);
+}
+
+static HRESULT WINAPI mfsample_GetBlob(IMFSample *iface, REFGUID key, UINT8 *buf,
+ UINT32 bufsize, UINT32 *blobsize)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetBlob(&This->attributes.IMFAttributes_iface, key, buf, bufsize, blobsize);
+}
+
+static HRESULT WINAPI mfsample_GetAllocatedBlob(IMFSample *iface, REFGUID key, UINT8 **buf, UINT32 *size)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetAllocatedBlob(&This->attributes.IMFAttributes_iface, key, buf, size);
+}
+
+static HRESULT WINAPI mfsample_GetUnknown(IMFSample *iface, REFGUID key, REFIID riid, void **ppv)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetUnknown(&This->attributes.IMFAttributes_iface, key, riid, ppv);
+}
+
+static HRESULT WINAPI mfsample_SetItem(IMFSample *iface, REFGUID key, REFPROPVARIANT value)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_SetItem(&This->attributes.IMFAttributes_iface, key, value);
+}
+
+static HRESULT WINAPI mfsample_DeleteItem(IMFSample *iface, REFGUID key)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_DeleteItem(&This->attributes.IMFAttributes_iface, key);
+}
+
+static HRESULT WINAPI mfsample_DeleteAllItems(IMFSample *iface)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_DeleteAllItems(&This->attributes.IMFAttributes_iface);
+}
+
+static HRESULT WINAPI mfsample_SetUINT32(IMFSample *iface, REFGUID key, UINT32 value)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_SetUINT32(&This->attributes.IMFAttributes_iface, key, value);
+}
+
+static HRESULT WINAPI mfsample_SetUINT64(IMFSample *iface, REFGUID key, UINT64 value)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_SetUINT64(&This->attributes.IMFAttributes_iface, key, value);
+}
+
+static HRESULT WINAPI mfsample_SetDouble(IMFSample *iface, REFGUID key, double value)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_SetDouble(&This->attributes.IMFAttributes_iface, key, value);
+}
+
+static HRESULT WINAPI mfsample_SetGUID(IMFSample *iface, REFGUID key, REFGUID value)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_SetGUID(&This->attributes.IMFAttributes_iface, key, value);
+}
+
+static HRESULT WINAPI mfsample_SetString(IMFSample *iface, REFGUID key, const WCHAR *value)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_SetString(&This->attributes.IMFAttributes_iface, key, value);
+}
+
+static HRESULT WINAPI mfsample_SetBlob(IMFSample *iface, REFGUID key, const UINT8 *buf, UINT32 size)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_SetBlob(&This->attributes.IMFAttributes_iface, key, buf, size);
+}
+
+static HRESULT WINAPI mfsample_SetUnknown(IMFSample *iface, REFGUID key, IUnknown *unknown)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_SetUnknown(&This->attributes.IMFAttributes_iface, key, unknown);
+}
+
+static HRESULT WINAPI mfsample_LockStore(IMFSample *iface)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_LockStore(&This->attributes.IMFAttributes_iface);
+}
+
+static HRESULT WINAPI mfsample_UnlockStore(IMFSample *iface)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_UnlockStore(&This->attributes.IMFAttributes_iface);
+}
+
+static HRESULT WINAPI mfsample_GetCount(IMFSample *iface, UINT32 *items)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetCount(&This->attributes.IMFAttributes_iface, items);
+}
+
+static HRESULT WINAPI mfsample_GetItemByIndex(IMFSample *iface, UINT32 index, GUID *key, PROPVARIANT *value)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+ return IMFAttributes_GetItemByIndex(&This->attributes.IMFAttributes_iface, index, key, value);
+}
+
+static HRESULT WINAPI mfsample_CopyAllItems(IMFSample *iface, IMFAttributes *dest)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p, %p\n", This, dest);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI mfsample_GetSampleFlags(IMFSample *iface, DWORD *flags)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p, %p\n", This, flags);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI mfsample_SetSampleFlags(IMFSample *iface, DWORD flags)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p, %x\n", This, flags);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI mfsample_GetSampleTime(IMFSample *iface, LONGLONG *sampletime)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p, %p\n", This, sampletime);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI mfsample_SetSampleTime(IMFSample *iface, LONGLONG sampletime)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p, %s\n", This, wine_dbgstr_longlong(sampletime));
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI mfsample_GetSampleDuration(IMFSample *iface, LONGLONG *duration)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p, %p\n", This, duration);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI mfsample_SetSampleDuration(IMFSample *iface, LONGLONG duration)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p, %s\n", This, wine_dbgstr_longlong(duration));
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI mfsample_GetBufferCount(IMFSample *iface, DWORD *count)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p, %p\n", This, count);
+
+ if(*count)
+ *count = 0;
+
+ return S_OK;
+}
+
+static HRESULT WINAPI mfsample_GetBufferByIndex(IMFSample *iface, DWORD index, IMFMediaBuffer **buffer)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p, %u, %p\n", This, index, buffer);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI mfsample_ConvertToContiguousBuffer(IMFSample *iface, IMFMediaBuffer **buffer)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p, %p\n", This, buffer);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI mfsample_AddBuffer(IMFSample *iface, IMFMediaBuffer *buffer)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p, %p\n", This, buffer);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI mfsample_RemoveBufferByIndex(IMFSample *iface, DWORD index)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p, %u\n", This, index);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI mfsample_RemoveAllBuffers(IMFSample *iface)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p\n", This);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI mfsample_GetTotalLength(IMFSample *iface, DWORD *length)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p, %p\n", This, length);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI mfsample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buffer)
+{
+ mfsample *This = impl_from_IMFSample(iface);
+
+ FIXME("%p, %p\n", This, buffer);
+
+ return E_NOTIMPL;
+}
+
+static const IMFSampleVtbl mfsample_vtbl =
+{
+ mfsample_QueryInterface,
+ mfsample_AddRef,
+ mfsample_Release,
+ mfsample_GetItem,
+ mfsample_GetItemType,
+ mfsample_CompareItem,
+ mfsample_Compare,
+ mfsample_GetUINT32,
+ mfsample_GetUINT64,
+ mfsample_GetDouble,
+ mfsample_GetGUID,
+ mfsample_GetStringLength,
+ mfsample_GetString,
+ mfsample_GetAllocatedString,
+ mfsample_GetBlobSize,
+ mfsample_GetBlob,
+ mfsample_GetAllocatedBlob,
+ mfsample_GetUnknown,
+ mfsample_SetItem,
+ mfsample_DeleteItem,
+ mfsample_DeleteAllItems,
+ mfsample_SetUINT32,
+ mfsample_SetUINT64,
+ mfsample_SetDouble,
+ mfsample_SetGUID,
+ mfsample_SetString,
+ mfsample_SetBlob,
+ mfsample_SetUnknown,
+ mfsample_LockStore,
+ mfsample_UnlockStore,
+ mfsample_GetCount,
+ mfsample_GetItemByIndex,
+ mfsample_CopyAllItems,
+ mfsample_GetSampleFlags,
+ mfsample_SetSampleFlags,
+ mfsample_GetSampleTime,
+ mfsample_SetSampleTime,
+ mfsample_GetSampleDuration,
+ mfsample_SetSampleDuration,
+ mfsample_GetBufferCount,
+ mfsample_GetBufferByIndex,
+ mfsample_ConvertToContiguousBuffer,
+ mfsample_AddBuffer,
+ mfsample_RemoveBufferByIndex,
+ mfsample_RemoveAllBuffers,
+ mfsample_GetTotalLength,
+ mfsample_CopyToBuffer
+};
+
+HRESULT WINAPI MFCreateSample(IMFSample **sample)
+{
+ mfsample *object;
+
+ TRACE("%p\n", sample);
+
+ object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) );
+ if(!object)
+ return E_OUTOFMEMORY;
+
+ object->ref = 1;
+ object->IMFSample_iface.lpVtbl = &mfsample_vtbl;
+ init_attribute_object(&object->attributes, 0);
+ *sample = &object->IMFSample_iface;
+
+ return S_OK;
+}
diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec
index 42b0b86..c58233d 100644
--- a/dlls/mfplat/mfplat.spec
+++ b/dlls/mfplat/mfplat.spec
@@ -55,7 +55,7 @@
@ stub MFCreateMemoryStream
@ stub MFCreatePathFromURL
@ stub MFCreatePresentationDescriptor
-@ stub MFCreateSample
+@ stdcall MFCreateSample(ptr)
@ stub MFCreateSocket
@ stub MFCreateSocketListener
@ stdcall MFCreateSourceResolver(ptr)
diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index ccbbfb7..17cdc46 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -363,6 +363,22 @@ static void test_MFCreateMemoryBuffer(void)
IMFMediaBuffer_Release(buffer);
}
+static void test_MFSample(void)
+{
+ IMFSample *sample;
+ HRESULT hr;
+ UINT32 count;
+
+ hr = MFCreateSample( &sample );
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ hr = IMFSample_GetBufferCount(sample, &count);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(count == 0, "got %d\n", count);
+
+ IMFSample_Release(sample);
+}
+
START_TEST(mfplat)
{
CoInitialize(NULL);
@@ -373,6 +389,7 @@ START_TEST(mfplat)
test_source_resolver();
test_MFCreateMediaType();
test_MFCreateAttributes();
+ test_MFSample();
test_MFCreateMFByteStreamOnStream();
test_MFCreateMemoryBuffer();
diff --git a/include/mfapi.h b/include/mfapi.h
index 5b98187..45449b1 100644
--- a/include/mfapi.h
+++ b/include/mfapi.h
@@ -67,6 +67,7 @@ HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key);
HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size);
HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue);
HRESULT WINAPI MFCreateMediaType(IMFMediaType **type);
+HRESULT WINAPI MFCreateSample(IMFSample **sample);
HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer);
HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity);
HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type,
--
2.7.4

1
patches/mfplat-MFCreateSample/definition
View File

@ -1 +0,0 @@
Fixes: [45617] Implement MFCreateSample

45
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "f274a198d21e5c89ea1dc6abdb5de5ad730c1233"
echo "0799550075654094a3bed080aac722b9bea01307"
}
# Show version information
@ -181,7 +181,6 @@ patch_enable_all ()
enable_libs_Debug_Channel="$1"
enable_libs_Unicode_Collation="$1"
enable_loader_OSX_Preloader="$1"
enable_mfplat_MFCreateSample="$1"
enable_mmsystem_dll16_MIDIHDR_Refcount="$1"
enable_mountmgr_DosDevices="$1"
enable_mscoree_CorValidateImage="$1"
@ -338,7 +337,6 @@ patch_enable_all ()
enable_uxtheme_GTK_Theming="$1"
enable_version_VerFindFileA="$1"
enable_version_VerQueryValue="$1"
enable_virtdisk_GetStorageDependencyInformation="$1"
enable_widl_SLTG_Typelib_Support="$1"
enable_windowscodecs_32bppPRGBA="$1"
enable_windowscodecs_GIF_Encoder="$1"
@ -715,9 +713,6 @@ patch_enable ()
loader-OSX_Preloader)
enable_loader_OSX_Preloader="$2"
;;
mfplat-MFCreateSample)
enable_mfplat_MFCreateSample="$2"
;;
mmsystem.dll16-MIDIHDR_Refcount)
enable_mmsystem_dll16_MIDIHDR_Refcount="$2"
;;
@ -1186,9 +1181,6 @@ patch_enable ()
version-VerQueryValue)
enable_version_VerQueryValue="$2"
;;
virtdisk-GetStorageDependencyInformation)
enable_virtdisk_GetStorageDependencyInformation="$2"
;;
widl-SLTG_Typelib_Support)
enable_widl_SLTG_Typelib_Support="$2"
;;
@ -4345,23 +4337,6 @@ if test "$enable_loader_OSX_Preloader" -eq 1; then
) >> "$patchlist"
fi
# Patchset mfplat-MFCreateSample
# |
# | This patchset fixes the following Wine bugs:
# | * [#45617] Implement MFCreateSample
# |
# | Modified files:
# | * dlls/mfplat/main.c, dlls/mfplat/mfplat.spec, dlls/mfplat/tests/mfplat.c, include/mfapi.h
# |
if test "$enable_mfplat_MFCreateSample" -eq 1; then
patch_apply mfplat-MFCreateSample/0002-mfplat-Forward-IMFStreamDescriptor-to-IMFAttributes.patch
patch_apply mfplat-MFCreateSample/0003-mfplat-Implement-MFCreateSample.patch
(
printf '%s\n' '+ { "Alistair Leslie-Hughes", "mfplat: Forward IMFStreamDescriptor to IMFAttributes.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "mfplat: Implement MFCreateSample.", 1 },';
) >> "$patchlist"
fi
# Patchset mmsystem.dll16-MIDIHDR_Refcount
# |
# | This patchset fixes the following Wine bugs:
@ -7004,24 +6979,6 @@ if test "$enable_version_VerQueryValue" -eq 1; then
) >> "$patchlist"
fi
# Patchset virtdisk-GetStorageDependencyInformation
# |
# | This patchset fixes the following Wine bugs:
# | * [#42577] Add stub for virtdisk.GetStorageDependencyInformation
# |
# | Modified files:
# | * configure, configure.ac, dlls/virtdisk/tests/Makefile.in, dlls/virtdisk/tests/virtdisk.c, dlls/virtdisk/virtdisk.spec,
# | dlls/virtdisk/virtdisk_main.c
# |
if test "$enable_virtdisk_GetStorageDependencyInformation" -eq 1; then
patch_apply virtdisk-GetStorageDependencyInformation/0002-virtdisk-Add-GetStorageDependencyInformation-stub.patch
patch_apply virtdisk-GetStorageDependencyInformation/0003-virtdisk-tests-Add-GetStorageDependencyInformation-t.patch
(
printf '%s\n' '+ { "Michael Müller", "virtdisk: Add GetStorageDependencyInformation stub.", 1 },';
printf '%s\n' '+ { "Gijs Vermeulen", "virtdisk/tests: Add GetStorageDependencyInformation tests.", 1 },';
) >> "$patchlist"
fi
# Patchset windowscodecs-Palette_Images
# |
# | Modified files:

60
patches/virtdisk-GetStorageDependencyInformation/0002-virtdisk-Add-GetStorageDependencyInformation-stub.patch
View File

@ -1,60 +0,0 @@
From d2a6ef055db332efbb7ebb36bda65b2611eb861b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 3 Mar 2017 14:23:53 +0100
Subject: [PATCH 2/3] virtdisk: Add GetStorageDependencyInformation stub.
---
dlls/virtdisk/virtdisk.spec | 2 +-
dlls/virtdisk/virtdisk_main.c | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/dlls/virtdisk/virtdisk.spec b/dlls/virtdisk/virtdisk.spec
index 2946b66..6bd5f14 100644
--- a/dlls/virtdisk/virtdisk.spec
+++ b/dlls/virtdisk/virtdisk.spec
@@ -8,7 +8,7 @@
@ stub EnumerateVirtualDiskMetadata
@ stub ExpandVirtualDisk
@ stub GetAllAttachedVirtualDiskPhysicalPaths
-@ stub GetStorageDependencyInformation
+@ stdcall GetStorageDependencyInformation(long long long ptr ptr)
@ stub GetVirtualDiskInformation
@ stub GetVirtualDiskMetadata
@ stub GetVirtualDiskOperationProgress
diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c
index 0da0dca..0f13404 100644
--- a/dlls/virtdisk/virtdisk_main.c
+++ b/dlls/virtdisk/virtdisk_main.c
@@ -22,6 +22,8 @@
#include "windef.h"
#include "winbase.h"
+#include "virtdisk.h"
+
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(virtdisk);
@@ -44,3 +46,20 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)
return TRUE;
}
+
+DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used)
+{
+ FIXME("(%p, 0x%x, %u, %p, %p): stub\n", obj, flags, size, info, used);
+
+ if (used) *used = sizeof(STORAGE_DEPENDENCY_INFO);
+
+ if (!info || !size)
+ return ERROR_INVALID_PARAMETER;
+
+ if (size < sizeof(STORAGE_DEPENDENCY_INFO))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ info->NumberEntries = 0;
+
+ return ERROR_SUCCESS;
+}
--
1.9.1

121
patches/virtdisk-GetStorageDependencyInformation/0003-virtdisk-tests-Add-GetStorageDependencyInformation-t.patch
View File

@ -1,121 +0,0 @@
From 6c514957d141fe9761d6281cdddbeaabf5234fe7 Mon Sep 17 00:00:00 2001
From: Gijs Vermeulen <gijsvrm@gmail.com>
Date: Mon, 28 May 2018 21:55:22 +0200
Subject: [PATCH 3/3] virtdisk/tests: Add GetStorageDependencyInformation
tests.
Signed-off-by: Gijs Vermeulen <gijsvrm@gmail.com>
---
configure | 1 +
configure.ac | 1 +
dlls/virtdisk/tests/Makefile.in | 4 +++
dlls/virtdisk/tests/virtdisk.c | 62 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 68 insertions(+)
create mode 100644 dlls/virtdisk/tests/Makefile.in
create mode 100644 dlls/virtdisk/tests/virtdisk.c
diff --git a/configure b/configure
index 456304b..4fd19dd 100755
--- a/configure
+++ b/configure
@@ -19215,6 +19215,7 @@ wine_fn_config_makefile dlls/ver.dll16 enable_win16
wine_fn_config_makefile dlls/version enable_version
wine_fn_config_makefile dlls/version/tests enable_tests
wine_fn_config_makefile dlls/virtdisk enable_virtdisk
+wine_fn_config_makefile dlls/virtdisk/tests enable_tests
wine_fn_config_makefile dlls/vmm.vxd enable_win16
wine_fn_config_makefile dlls/vnbt.vxd enable_win16
wine_fn_config_makefile dlls/vnetbios.vxd enable_win16
diff --git a/configure.ac b/configure.ac
index 600cb63..f61c3b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3715,6 +3715,7 @@ WINE_CONFIG_MAKEFILE(dlls/ver.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/version)
WINE_CONFIG_MAKEFILE(dlls/version/tests)
WINE_CONFIG_MAKEFILE(dlls/virtdisk)
+WINE_CONFIG_MAKEFILE(dlls/virtdisk/tests)
WINE_CONFIG_MAKEFILE(dlls/vmm.vxd,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/vnbt.vxd,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/vnetbios.vxd,enable_win16)
diff --git a/dlls/virtdisk/tests/Makefile.in b/dlls/virtdisk/tests/Makefile.in
new file mode 100644
index 0000000..d0557cb
--- /dev/null
+++ b/dlls/virtdisk/tests/Makefile.in
@@ -0,0 +1,4 @@
+TESTDLL = virtdisk.dll
+
+C_SRCS = \
+ virtdisk.c
diff --git a/dlls/virtdisk/tests/virtdisk.c b/dlls/virtdisk/tests/virtdisk.c
new file mode 100644
index 0000000..2719d51
--- /dev/null
+++ b/dlls/virtdisk/tests/virtdisk.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2018 Gijs Vermeulen
+ *
+ * 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 "virtdisk.h"
+#include "wine/heap.h"
+#include "wine/test.h"
+
+static DWORD (WINAPI *pGetStorageDependencyInformation)(HANDLE,GET_STORAGE_DEPENDENCY_FLAG,ULONG,STORAGE_DEPENDENCY_INFO*,ULONG*);
+
+static void test_GetStorageDependencyInformation(void)
+{
+ DWORD ret;
+ HANDLE handle;
+ STORAGE_DEPENDENCY_INFO *info;
+ ULONG size;
+
+ handle = CreateFileA("C:", 0, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
+ ok(handle != INVALID_HANDLE_VALUE, "Expected a handle\n");
+
+ size = sizeof(STORAGE_DEPENDENCY_INFO);
+ info = heap_alloc(size);
+
+ ret = pGetStorageDependencyInformation(handle, GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE, 0, info, 0);
+ ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret);
+
+ ret = pGetStorageDependencyInformation(handle, GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE, size, NULL, 0);
+ ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret);
+
+ heap_free(info);
+ CloseHandle(handle);
+}
+
+START_TEST(virtdisk)
+{
+ HMODULE module = LoadLibraryA("virtdisk.dll");
+ if(!module)
+ {
+ win_skip("virtdisk.dll not installed\n");
+ return;
+ }
+
+ pGetStorageDependencyInformation = (void *)GetProcAddress( module, "GetStorageDependencyInformation" );
+ if (pGetStorageDependencyInformation)
+ test_GetStorageDependencyInformation();
+ else
+ win_skip("GetStorageDependencyInformation is not available\n");
+}
--
1.9.1

1
patches/virtdisk-GetStorageDependencyInformation/definition
View File

@ -1 +0,0 @@
Fixes: [42577] Add stub for virtdisk.GetStorageDependencyInformation