mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Drop mfplat-MFGetConfigurationDWORD patchset
Mixing Native/Builtin mfplat isn't supported.
This commit is contained in:
parent
47891c1826
commit
053de1b617
@ -1,50 +0,0 @@
|
||||
From cd8c2fb687e322b2d142ad0d6b23978e56df5a5c Mon Sep 17 00:00:00 2001
|
||||
From: Andrey Gusev <andrey.goosev@gmail.com>
|
||||
Date: Sun, 1 Sep 2019 18:34:53 +0300
|
||||
Subject: [PATCH 1/2] mfplat: Add DestroyPropVariant stub.
|
||||
|
||||
---
|
||||
dlls/mfplat/main.c | 13 +++++++++++++
|
||||
dlls/mfplat/mfplat.spec | 2 +-
|
||||
2 files changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
|
||||
index 5cbf1212f7..755b86aced 100644
|
||||
--- a/dlls/mfplat/main.c
|
||||
+++ b/dlls/mfplat/main.c
|
||||
@@ -7619,6 +7619,19 @@ HRESULT WINAPI CreatePropertyStore(IPropertyStore **store)
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
+/***********************************************************************
|
||||
+ * DestroyPropVariant (mfplat.@)
|
||||
+ */
|
||||
+HRESULT WINAPI DestroyPropVariant(PROPVARIANT *pv)
|
||||
+{
|
||||
+ FIXME("%p stub!\n", pv);
|
||||
+
|
||||
+ if (!pv)
|
||||
+ return E_POINTER;
|
||||
+
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
struct dxgi_device_manager
|
||||
{
|
||||
IMFDXGIDeviceManager IMFDXGIDeviceManager_iface;
|
||||
diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec
|
||||
index cc440c5ee0..a217bda82d 100644
|
||||
--- a/dlls/mfplat/mfplat.spec
|
||||
+++ b/dlls/mfplat/mfplat.spec
|
||||
@@ -11,7 +11,7 @@
|
||||
@ stub CopyPropVariant
|
||||
@ stub CreatePropVariant
|
||||
@ stdcall CreatePropertyStore(ptr)
|
||||
-@ stub DestroyPropVariant
|
||||
+@ stdcall DestroyPropVariant(ptr)
|
||||
@ stub GetAMSubtypeFromD3DFormat
|
||||
@ stub GetD3DFormatFromMFSubtype
|
||||
@ stub LFGetGlobalPool
|
||||
--
|
||||
2.17.1
|
||||
|
@ -1,47 +0,0 @@
|
||||
From a45f5f4a1605bd5c1324c641bbe6fbc5d5c3df90 Mon Sep 17 00:00:00 2001
|
||||
From: Andrey Gusev <andrey.goosev@gmail.com>
|
||||
Date: Sun, 1 Sep 2019 17:40:05 +0300
|
||||
Subject: [PATCH 2/2] mfplat: Add MFGetConfigurationDWORD stub.
|
||||
|
||||
---
|
||||
dlls/mfplat/main.c | 10 ++++++++++
|
||||
dlls/mfplat/mfplat.spec | 2 +-
|
||||
2 files changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
|
||||
index 755b86aced..a74d472d15 100644
|
||||
--- a/dlls/mfplat/main.c
|
||||
+++ b/dlls/mfplat/main.c
|
||||
@@ -2300,6 +2300,16 @@ static HRESULT attributes_deserialize_read(struct attr_serialize_context *contex
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
+/***********************************************************************
|
||||
+ * MFGetConfigurationDWORD (mfplat.@)
|
||||
+ */
|
||||
+HRESULT WINAPI MFGetConfigurationDWORD(void *unk1, void *unk2, void *unk3)
|
||||
+{
|
||||
+ FIXME("%p, %p, %p stub!\n", unk1, unk2, unk3);
|
||||
+
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
/***********************************************************************
|
||||
* MFInitAttributesFromBlob (mfplat.@)
|
||||
*/
|
||||
diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec
|
||||
index a217bda82d..18cefa936b 100644
|
||||
--- a/dlls/mfplat/mfplat.spec
|
||||
+++ b/dlls/mfplat/mfplat.spec
|
||||
@@ -89,7 +89,7 @@
|
||||
@ stub MFGetAdaptersAddresses
|
||||
@ stdcall MFGetAttributesAsBlob(ptr ptr long)
|
||||
@ stdcall MFGetAttributesAsBlobSize(ptr ptr)
|
||||
-@ stub MFGetConfigurationDWORD
|
||||
+@ stdcall MFGetConfigurationDWORD(ptr ptr ptr)
|
||||
@ stub MFGetConfigurationPolicy
|
||||
@ stub MFGetConfigurationStore
|
||||
@ stub MFGetConfigurationString
|
||||
--
|
||||
2.17.1
|
||||
|
@ -1 +0,0 @@
|
||||
Fixes: [47757] - mfplat: Add MFGetConfigurationDWORD stub.
|
@ -171,7 +171,6 @@ patch_enable_all ()
|
||||
enable_libs_Debug_Channel="$1"
|
||||
enable_libs_Unicode_Collation="$1"
|
||||
enable_loader_KeyboardLayouts="$1"
|
||||
enable_mfplat_MFGetConfigurationDWORD="$1"
|
||||
enable_mmsystem_dll16_MIDIHDR_Refcount="$1"
|
||||
enable_mountmgr_DosDevices="$1"
|
||||
enable_mscoree_CorValidateImage="$1"
|
||||
@ -640,9 +639,6 @@ patch_enable ()
|
||||
loader-KeyboardLayouts)
|
||||
enable_loader_KeyboardLayouts="$2"
|
||||
;;
|
||||
mfplat-MFGetConfigurationDWORD)
|
||||
enable_mfplat_MFGetConfigurationDWORD="$2"
|
||||
;;
|
||||
mmsystem.dll16-MIDIHDR_Refcount)
|
||||
enable_mmsystem_dll16_MIDIHDR_Refcount="$2"
|
||||
;;
|
||||
@ -4467,23 +4463,6 @@ if test "$enable_loader_KeyboardLayouts" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset mfplat-MFGetConfigurationDWORD
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#47757] - mfplat: Add MFGetConfigurationDWORD stub.
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/mfplat/main.c, dlls/mfplat/mfplat.spec
|
||||
# |
|
||||
if test "$enable_mfplat_MFGetConfigurationDWORD" -eq 1; then
|
||||
patch_apply mfplat-MFGetConfigurationDWORD/0001-mfplat-Add-DestroyPropVariant-stub.patch
|
||||
patch_apply mfplat-MFGetConfigurationDWORD/0002-mfplat-Add-MFGetConfigurationDWORD-stub.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Andrey Gusev", "mfplat: Add DestroyPropVariant stub.", 1 },';
|
||||
printf '%s\n' '+ { "Andrey Gusev", "mfplat: Add MFGetConfigurationDWORD stub.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset mmsystem.dll16-MIDIHDR_Refcount
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
Loading…
Reference in New Issue
Block a user