wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against f274a198d21e5c89ea1dc6abdb5de5ad730c1233

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2018-09-13 08:12:46 +10:00
parent 8f0e72776f
commit 6587db3575
3 changed files with 2 additions and 499 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

368
patches/mfplat-MFCreateSample/0001-mfplat-Forward-IMFMediaType-to-IMFAttributes.patch
View File

@ -1,368 +0,0 @@
From 794bad144407eaaa1c046984dae2942d75a7afe1 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 23 Aug 2018 12:22:07 +1000
Subject: [PATCH 1/3] mfplat: Forward IMFMediaType to IMFAttributes
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
---
dlls/mfplat/main.c | 164 ++++++++++++++---------------------------------------
1 file changed, 41 insertions(+), 123 deletions(-)
diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index 9f381ef..ee9be91 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -1148,6 +1148,12 @@ static const IMFAttributesVtbl mfattributes_vtbl =
mfattributes_CopyAllItems
};
+static void init_attribute_object(mfattributes *object, UINT32 size)
+{
+ object->ref = 1;
+ object->IMFAttributes_iface.lpVtbl = &mfattributes_vtbl;
+}
+
/***********************************************************************
* MFCreateAttributes (mfplat.@)
*/
@@ -1161,10 +1167,9 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size)
if(!object)
return E_OUTOFMEMORY;
- object->ref = 1;
- object->IMFAttributes_iface.lpVtbl = &mfattributes_vtbl;
-
+ init_attribute_object(object, size);
*attributes = &object->IMFAttributes_iface;
+
return S_OK;
}
@@ -1335,6 +1340,7 @@ HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver)
typedef struct _mfmediatype
{
+ mfattributes attributes;
IMFMediaType IMFMediaType_iface;
LONG ref;
} mfmediatype;
@@ -1395,269 +1401,179 @@ static ULONG WINAPI mediatype_Release(IMFMediaType *iface)
static HRESULT WINAPI mediatype_GetItem(IMFMediaType *iface, REFGUID key, PROPVARIANT *value)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_GetItemType(IMFMediaType *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_CompareItem(IMFMediaType *iface, REFGUID key, REFPROPVARIANT value, BOOL *result)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_Compare(IMFMediaType *iface, IMFAttributes *attrs, MF_ATTRIBUTES_MATCH_TYPE type,
BOOL *result)
{
mfmediatype *This = impl_from_IMFMediaType(iface);
-
- FIXME("%p, %p, %d, %p\n", This, attrs, type, result);
-
- return E_NOTIMPL;
+ return IMFAttributes_Compare(&This->attributes.IMFAttributes_iface, attrs, type, result);
}
static HRESULT WINAPI mediatype_GetUINT32(IMFMediaType *iface, REFGUID key, UINT32 *value)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_GetUINT64(IMFMediaType *iface, REFGUID key, UINT64 *value)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_GetDouble(IMFMediaType *iface, REFGUID key, double *value)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_GetGUID(IMFMediaType *iface, REFGUID key, GUID *value)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_GetStringLength(IMFMediaType *iface, REFGUID key, UINT32 *length)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_GetString(IMFMediaType *iface, REFGUID key, WCHAR *value,
UINT32 size, UINT32 *length)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_GetAllocatedString(IMFMediaType *iface, REFGUID key,
WCHAR **value, UINT32 *length)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_GetBlobSize(IMFMediaType *iface, REFGUID key, UINT32 *size)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_GetBlob(IMFMediaType *iface, REFGUID key, UINT8 *buf,
UINT32 bufsize, UINT32 *blobsize)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_GetAllocatedBlob(IMFMediaType *iface, REFGUID key, UINT8 **buf, UINT32 *size)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_GetUnknown(IMFMediaType *iface, REFGUID key, REFIID riid, void **ppv)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_SetItem(IMFMediaType *iface, REFGUID key, REFPROPVARIANT value)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_DeleteItem(IMFMediaType *iface, REFGUID key)
{
mfmediatype *This = impl_from_IMFMediaType(iface);
-
- FIXME("%p, %s\n", This, debugstr_guid(key));
-
- return E_NOTIMPL;
+ return IMFAttributes_DeleteItem(&This->attributes.IMFAttributes_iface, key);
}
static HRESULT WINAPI mediatype_DeleteAllItems(IMFMediaType *iface)
{
mfmediatype *This = impl_from_IMFMediaType(iface);
-
- FIXME("%p\n", This);
-
- return E_NOTIMPL;
+ return IMFAttributes_DeleteAllItems(&This->attributes.IMFAttributes_iface);
}
static HRESULT WINAPI mediatype_SetUINT32(IMFMediaType *iface, REFGUID key, UINT32 value)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_SetUINT64(IMFMediaType *iface, REFGUID key, UINT64 value)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_SetDouble(IMFMediaType *iface, REFGUID key, double value)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_SetGUID(IMFMediaType *iface, REFGUID key, REFGUID value)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_SetString(IMFMediaType *iface, REFGUID key, const WCHAR *value)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_SetBlob(IMFMediaType *iface, REFGUID key, const UINT8 *buf, UINT32 size)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_SetUnknown(IMFMediaType *iface, REFGUID key, IUnknown *unknown)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_LockStore(IMFMediaType *iface)
{
mfmediatype *This = impl_from_IMFMediaType(iface);
-
- FIXME("%p\n", This);
-
- return E_NOTIMPL;
+ return IMFAttributes_LockStore(&This->attributes.IMFAttributes_iface);
}
static HRESULT WINAPI mediatype_UnlockStore(IMFMediaType *iface)
{
mfmediatype *This = impl_from_IMFMediaType(iface);
-
- FIXME("%p\n", This);
-
- return E_NOTIMPL;
+ return IMFAttributes_UnlockStore(&This->attributes.IMFAttributes_iface);
}
static HRESULT WINAPI mediatype_GetCount(IMFMediaType *iface, UINT32 *items)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_GetItemByIndex(IMFMediaType *iface, UINT32 index, GUID *key, PROPVARIANT *value)
{
mfmediatype *This = impl_from_IMFMediaType(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 mediatype_CopyAllItems(IMFMediaType *iface, IMFAttributes *dest)
@@ -1768,14 +1684,16 @@ HRESULT WINAPI MFCreateMediaType(IMFMediaType **type)
if(!type)
return E_INVALIDARG;
- object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) );
+ object = heap_alloc( sizeof(*object) );
if(!object)
return E_OUTOFMEMORY;
object->ref = 1;
object->IMFMediaType_iface.lpVtbl = &mediatype_vtbl;
+ init_attribute_object(&object->attributes, 0);
*type = &object->IMFMediaType_iface;
+
return S_OK;
}
--
2.7.4

8
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "b29cdbd5f23548d9631e5c98ec923b6d2d16a3f8"
echo "f274a198d21e5c89ea1dc6abdb5de5ad730c1233"
}
# Show version information
@ -4325,11 +4325,9 @@ fi
# | * 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/0001-mfplat-Forward-IMFMediaType-to-IMFAttributes.patch
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 IMFMediaType to IMFAttributes.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "mfplat: Forward IMFStreamDescriptor to IMFAttributes.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "mfplat: Implement MFCreateSample.", 1 },';
) >> "$patchlist"
@ -6984,14 +6982,12 @@ fi
# |
# | Modified files:
# | * configure, configure.ac, dlls/virtdisk/tests/Makefile.in, dlls/virtdisk/tests/virtdisk.c, dlls/virtdisk/virtdisk.spec,
# | dlls/virtdisk/virtdisk_main.c, include/Makefile.in, include/virtdisk.h
# | dlls/virtdisk/virtdisk_main.c
# |
if test "$enable_virtdisk_GetStorageDependencyInformation" -eq 1; then
patch_apply virtdisk-GetStorageDependencyInformation/0001-include-add-headerfile-virtdisk.h.patch
patch_apply virtdisk-GetStorageDependencyInformation/0002-virtdisk-Add-GetStorageDependencyInformation-stub.patch
patch_apply virtdisk-GetStorageDependencyInformation/0003-virtdisk-tests-Add-GetStorageDependencyInformation-t.patch
(
printf '%s\n' '+ { "Louis Lenders", "include: Add headerfile virtdisk.h.", 1 },';
printf '%s\n' '+ { "Michael Müller", "virtdisk: Add GetStorageDependencyInformation stub.", 1 },';
printf '%s\n' '+ { "Gijs Vermeulen", "virtdisk/tests: Add GetStorageDependencyInformation tests.", 1 },';
) >> "$patchlist"

125
patches/virtdisk-GetStorageDependencyInformation/0001-include-add-headerfile-virtdisk.h.patch
View File

@ -1,125 +0,0 @@
From c981822f9574d88b865917fe96fa46dd247a2b0b Mon Sep 17 00:00:00 2001
From: Louis Lenders <xerox.xerox2000x@gmail.com>
Date: Fri, 3 Mar 2017 10:00:14 +0100
Subject: [PATCH 1/3] include: add headerfile virtdisk.h
Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
---
include/Makefile.in | 1 +
include/virtdisk.h | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 93 insertions(+)
create mode 100644 include/virtdisk.h
diff --git a/include/Makefile.in b/include/Makefile.in
index 78ab095..900e326 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -631,6 +631,7 @@ SOURCES = \
verrsrc.h \
vfw.h \
vfwmsgs.h \
+ virtdisk.h \
vmr9.idl \
vmrender.idl \
vss.idl \
diff --git a/include/virtdisk.h b/include/virtdisk.h
new file mode 100644
index 0000000..7924689
--- /dev/null
+++ b/include/virtdisk.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2017 Louis Lenders
+ *
+ * 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
+ */
+
+#ifndef __WINE_VIRTDISK_DLL_H
+#define __WINE_VIRTDISK_DLL_H
+
+#include <windows.h>
+
+typedef enum _GET_STORAGE_DEPENDENCY_FLAG
+{
+ GET_STORAGE_DEPENDENCY_FLAG_NONE = 0x00000000,
+ GET_STORAGE_DEPENDENCY_FLAG_HOST_VOLUMES = 0x00000001,
+ GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE = 0x00000002,
+} GET_STORAGE_DEPENDENCY_FLAG;
+
+typedef enum _DEPENDENT_DISK_FLAG
+{
+ DEPENDENT_DISK_FLAG_NONE = 0x00000000,
+ DEPENDENT_DISK_FLAG_MULT_BACKING_FILES = 0x00000001,
+ DEPENDENT_DISK_FLAG_FULLY_ALLOCATED = 0x00000002,
+ DEPENDENT_DISK_FLAG_READ_ONLY = 0x00000004,
+ DEPENDENT_DISK_FLAG_REMOTE = 0x00000008,
+ DEPENDENT_DISK_FLAG_SYSTEM_VOLUME = 0x00000010,
+ DEPENDENT_DISK_FLAG_SYSTEM_VOLUME_PARENT = 0x00000020,
+ DEPENDENT_DISK_FLAG_REMOVABLE = 0x00000040,
+ DEPENDENT_DISK_FLAG_NO_DRIVE_LETTER = 0x00000080,
+ DEPENDENT_DISK_FLAG_PARENT = 0x00000100,
+ DEPENDENT_DISK_FLAG_NO_HOST_DISK = 0x00000200,
+ DEPENDENT_DISK_FLAG_PERMANENT_LIFETIME = 0x00000400,
+} DEPENDENT_DISK_FLAG;
+
+typedef enum _STORAGE_DEPENDENCY_INFO_VERSION
+{
+ STORAGE_DEPENDENCY_INFO_VERSION_UNSPECIFIED = 0x0,
+ STORAGE_DEPENDENCY_INFO_VERSION_1 = 0x1,
+ STORAGE_DEPENDENCY_INFO_VERSION_2 = 0x2
+} STORAGE_DEPENDENCY_INFO_VERSION;
+
+typedef struct _VIRTUAL_STORAGE_TYPE
+{
+ ULONG DeviceId;
+ GUID VendorId;
+} VIRTUAL_STORAGE_TYPE, *PVIRTUAL_STORAGE_TYPE;
+
+typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_1
+{
+ DEPENDENT_DISK_FLAG DependencyTypeFlags;
+ ULONG ProviderSpecificFlags;
+ VIRTUAL_STORAGE_TYPE VirtualStorageType;
+} STORAGE_DEPENDENCY_INFO_TYPE_1, *PSTORAGE_DEPENDENCY_INFO_TYPE_1;
+
+typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_2
+{
+ DEPENDENT_DISK_FLAG DependencyTypeFlags;
+ ULONG ProviderSpecificFlags;
+ VIRTUAL_STORAGE_TYPE VirtualStorageType;
+ ULONG AncestorLevel;
+ PWSTR DependencyDeviceName;
+ PWSTR HostVolumeName;
+ PWSTR DependentVolumeName;
+ PWSTR DependentVolumeRelativePath;
+} STORAGE_DEPENDENCY_INFO_TYPE_2, *PSTORAGE_DEPENDENCY_INFO_TYPE_2;
+
+typedef struct _STORAGE_DEPENDENCY_INFO
+{
+ STORAGE_DEPENDENCY_INFO_VERSION Version;
+ ULONG NumberEntries;
+ __C89_NAMELESS union
+ {
+ STORAGE_DEPENDENCY_INFO_TYPE_1 *Version1Entries;
+ STORAGE_DEPENDENCY_INFO_TYPE_2 *Version2Entries;
+ } __C89_NAMELESSUNIONNAME;
+} STORAGE_DEPENDENCY_INFO, *PSTORAGE_DEPENDENCY_INFO;
+
+DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used);
+
+#endif /* __WINE_VIRTDISK_DLL_H */
--
1.9.1