From e06dec2c39c7b7d0c963d46adc192191fa742a9e Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 24 Mar 2016 05:57:23 +0100 Subject: [PATCH] windowscodecs-IMILBitmapSource: Fix number of arguments to IMILUnknown2Impl_unknown2. --- patches/patchinstall.sh | 2 +- ...s-Improve-compatibility-of-IMILBitmapSou.patch | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 1691c657..4bf145bd 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -7023,7 +7023,7 @@ if test "$enable_windowscodecs_IMILBitmapSource" -eq 1; then patch_apply windowscodecs-IMILBitmapSource/0001-windowscodecs-Improve-compatibility-of-IMILBitmapSou.patch patch_apply windowscodecs-IMILBitmapSource/0002-windowscodecs-Add-support-for-IMILBitmapScaler-inter.patch ( - echo '+ { "Dmitry Timoshkov", "windowscodecs: Improve compatibility of IMILBitmapSource interface.", 2 },'; + echo '+ { "Dmitry Timoshkov", "windowscodecs: Improve compatibility of IMILBitmapSource interface.", 3 },'; echo '+ { "Dmitry Timoshkov", "windowscodecs: Add support for IMILBitmapScaler interface.", 2 },'; ) >> "$patchlist" fi diff --git a/patches/windowscodecs-IMILBitmapSource/0001-windowscodecs-Improve-compatibility-of-IMILBitmapSou.patch b/patches/windowscodecs-IMILBitmapSource/0001-windowscodecs-Improve-compatibility-of-IMILBitmapSou.patch index 13b8bd74..55fe9e25 100644 --- a/patches/windowscodecs-IMILBitmapSource/0001-windowscodecs-Improve-compatibility-of-IMILBitmapSou.patch +++ b/patches/windowscodecs-IMILBitmapSource/0001-windowscodecs-Improve-compatibility-of-IMILBitmapSou.patch @@ -1,7 +1,8 @@ -From b086b2918e0d14549131e15fe7527778f8abfe94 Mon Sep 17 00:00:00 2001 +From 2393324ce158c6e47d7fc3dcaf1266302e96285b Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Tue, 22 Mar 2016 23:46:30 +0800 -Subject: windowscodecs: Improve compatibility of IMILBitmapSource interface. (v2) +Subject: windowscodecs: Improve compatibility of IMILBitmapSource interface. + (v3) Based on Focht's investigation. This makes the test application attached to the bug 34764 work. @@ -11,7 +12,7 @@ to the bug 34764 work. 2 files changed, 197 insertions(+), 45 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c -index 6adaab0..f2aaef9 100644 +index 6adaab0..09a5e62 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -135,6 +135,7 @@ static HRESULT WINAPI BitmapLockImpl_QueryInterface(IWICBitmapLock *iface, REFII @@ -306,9 +307,9 @@ index 6adaab0..f2aaef9 100644 + return E_NOTIMPL; +} + -+static HRESULT WINAPI IMILUnknown2Impl_unknown2(IMILUnknown2 *iface) ++static HRESULT WINAPI IMILUnknown2Impl_unknown2(IMILUnknown2 *iface, void *arg1, void *arg2) +{ -+ FIXME("(%p): stub\n", iface); ++ FIXME("(%p,%p,%p): stub\n", iface, arg1, arg2); + return E_NOTIMPL; +} + @@ -330,7 +331,7 @@ index 6adaab0..f2aaef9 100644 HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h -index f54403c..eda1b7a 100644 +index f54403c..218228a 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -30,7 +30,13 @@ DEFINE_GUID(GUID_WineContainerFormatTga, 0x0c44fda1,0xa5c5,0x4298,0x96,0x85,0x47 @@ -419,7 +420,7 @@ index f54403c..eda1b7a 100644 /*** unknown methods ***/ - STDMETHOD_(HRESULT,UnknownMethod1)(THIS_ void *, void *) PURE; + STDMETHOD_(HRESULT,unknown1)(THIS_ void *,void **) PURE; -+ STDMETHOD_(HRESULT,unknown2)(THIS) PURE; ++ STDMETHOD_(HRESULT,unknown2)(THIS_ void *,void *) PURE; + STDMETHOD_(HRESULT,unknown3)(THIS_ void *) PURE; }; #undef INTERFACE