April 2022 - Wine-commits - list.winehq.org

Austin English : dbghelp: Downgrade a FIXME to a WARN.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: 8d3ca2130af3175c8f705b66c47542b9570af8e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d3ca2130af3175c8f705b66… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 13 16:05:58 2022 -0500 dbghelp: Downgrade a FIXME to a WARN. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52790 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5cc105d35c9..0076b19e5cb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1248,7 +1248,7 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in if (low < *plow) *plow = low; if (high > *phigh) *phigh = high; } - if (*plow == UMAX || *phigh == 0) {FIXME("no entry found\n"); return FALSE;} + if (*plow == UMAX || *phigh == 0) {WARN("no entry found\n"); return FALSE;} if (*plow == *phigh) {WARN("entry found, but low=high %Ix %Ix\n", low, high); return FALSE;} return TRUE;

1 0

Zebediah Figura : include: Add amva.h.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: 341a085fa446b50134af3dbe63efc8b71ce3e534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=341a085fa446b50134af3dbe… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 13 17:01:59 2022 -0500 include: Add amva.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/amva.h | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 047e7ff9146..c76e2ec7d0d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -14,6 +14,7 @@ SOURCES = \ amaudio.h \ amsi.idl \ amstream.idl \ + amva.h \ amvideo.idl \ appcompatapi.h \ appmgmt.h \ diff --git a/include/amva.h b/include/amva.h new file mode 100644 index 00000000000..faf103270fc --- /dev/null +++ b/include/amva.h @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2022 Zebediah Figura for CodeWeavers + * + * 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 __AMVA_INCLUDED__ +#define __AMVA_INCLUDED__ + +typedef struct _tag_AMVABeginFrameInfo +{ + DWORD dwDestSurfaceIndex; + void *pInputData; + DWORD dwSizeInputData; + void *pOutputData; + DWORD dwSizeOutputData; +} AMVABeginFrameInfo, *LPAMVABeginFrameInfo; + +typedef struct _tag_AMVABUFFERINFO +{ + DWORD dwTypeIndex; + DWORD dwBufferIndex; + DWORD dwDataOffset; + DWORD dwDataSize; +} AMVABUFFERINFO, *LPAMVABUFFERINFO; + +typedef struct _tag_AMVACompBufferInfo +{ + DWORD dwNumCompBuffers; + DWORD dwWidthToCreate; + DWORD dwHeightToCreate; + DWORD dwBytesToAllocate; + DDSCAPS2 ddCompCaps; + DDPIXELFORMAT ddPixelFormat; +} AMVACompBufferInfo, *LPAMVACompBufferInfo; + +typedef struct _tag_AMVAEndFrameInfo +{ + DWORD dwSizeMiscData; + void *pMiscData; +} AMVAEndFrameInfo, *LPAMVAEndFrameInfo; + +typedef struct _tag_AMVAInternalMemInfo +{ + DWORD dwScratchMemAlloc; +} AMVAInternalMemInfo, *LPAMVAInternalMemInfo; + +typedef struct _tag_AMVAUncompBufferInfo +{ + DWORD dwMinNumSurfaces; + DWORD dwMaxNumSurfaces; + DDPIXELFORMAT ddUncompPixelFormat; +} AMVAUncompBufferInfo, *LPAMVAUncompBufferInfo; + +typedef struct _tag_AMVAUncompDataInfo +{ + DWORD dwUncompWidth; + DWORD dwUncompHeight; + DDPIXELFORMAT ddUncompPixelFormat; +} AMVAUncompDataInfo, *LPAMVAUncompDataInfo; + +#endif

1 0

Zebediah Figura : include: Add videoacc.idl.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: 5f9f182e8a58d0f658e6baf135b5327cbcaf3169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9f182e8a58d0f658e6baf1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 13 17:02:00 2022 -0500 include: Add videoacc.idl. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/videoacc.idl | 126 +++++++++++++++++++++++++++++++++++++++++++++++ libs/strmiids/strmiids.c | 1 + 3 files changed, 128 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c76e2ec7d0d..dff2f341568 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -747,6 +747,7 @@ SOURCES = \ verrsrc.h \ vfw.h \ vfwmsgs.h \ + videoacc.idl \ virtdisk.h \ vmr9.idl \ vmrender.idl \ diff --git a/include/videoacc.idl b/include/videoacc.idl new file mode 100644 index 00000000000..af380e4b3c8 --- /dev/null +++ b/include/videoacc.idl @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2022 Zebediah Figura for CodeWeavers + * + * 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 + */ + +import "unknwn.idl"; + +interface IMediaSample; + +cpp_quote("#if 0") + +typedef struct _DDSCAPS2 +{ + DWORD dwCaps; + DWORD dwCaps2; + DWORD dwCaps3; + union + { + DWORD dwCaps4; + DWORD dwVolumeDepth; + } DUMMYUNIONNAME1; +} DDSCAPS2; + +typedef struct _DDPIXELFORMAT +{ + DWORD dwSize; + DWORD dwFlags; + DWORD dwFourCC; + union + { + DWORD dwRGBBitCount; + DWORD dwYUVBitCount; + DWORD dwZBufferBitDepth; + DWORD dwAlphaBitDepth; + DWORD dwLuminanceBitCount; + DWORD dwBumpBitCount; + DWORD dwPrivateFormatBitCount; + } DUMMYUNIONNAME1; + union + { + DWORD dwRBitMask; + DWORD dwYBitMask; + DWORD dwStencilBitDepth; + DWORD dwLuminanceBitMask; + DWORD dwBumpDuBitMask; + DWORD dwOperations; + } DUMMYUNIONNAME2; + union + { + DWORD dwGBitMask; + DWORD dwUBitMask; + DWORD dwZBitMask; + DWORD dwBumpDvBitMask; + struct + { + WORD wFlipMSTypes; + WORD wBltMSTypes; + } MultiSampleCaps; + } DUMMYUNIONNAME3; + union + { + DWORD dwBBitMask; + DWORD dwVBitMask; + DWORD dwStencilBitMask; + DWORD dwBumpLuminanceBitMask; + } DUMMYUNIONNAME4; + union + { + DWORD dwRGBAlphaBitMask; + DWORD dwYUVAlphaBitMask; + DWORD dwLuminanceAlphaBitMask; + DWORD dwRGBZBitMask; + DWORD dwYUVZBitMask; + } DUMMYUNIONNAME5; +} DDPIXELFORMAT; + +import "amva.h"; + +cpp_quote("#endif") + +[ + local, + uuid(256a6a22-fbad-11d1-82bf-00a0c9696c8f), +] +interface IAMVideoAccelerator : IUnknown +{ + HRESULT GetVideoAcceleratorGUIDs(DWORD *count, GUID *accelerators); + HRESULT GetUncompFormatsSupported(const GUID *accelerator, DWORD *count, DDPIXELFORMAT *formats); + HRESULT GetInternalMemInfo(const GUID *accelerator, + const AMVAUncompDataInfo *format_info, AMVAInternalMemInfo *mem_info); + HRESULT GetCompBufferInfo(const GUID *accelerator, const AMVAUncompDataInfo *uncompressed_info, + DWORD *compressed_info_count, AMVACompBufferInfo *compressed_infos); + HRESULT GetInternalCompBufferInfo(DWORD *count, AMVACompBufferInfo *infos); + HRESULT BeginFrame(const AMVABeginFrameInfo *info); + HRESULT EndFrame(const AMVAEndFrameInfo *info); + HRESULT GetBuffer(DWORD type_index, DWORD buffer_index, BOOL read_only, void **buffer, LONG *stride); + HRESULT ReleaseBuffer(DWORD type_index, DWORD buffer_index); + HRESULT Execute(DWORD function, void *in_data, DWORD in_size, void *out_data, + DWORD out_size, DWORD buffer_count, const AMVABUFFERINFO *buffers); + HRESULT QueryRenderStatus(DWORD type_index, DWORD buffer_index, DWORD flags); + HRESULT DisplayFrame(DWORD index, IMediaSample *sample); +} + +[ + local, + uuid(256a6a21-fbad-11d1-82bf-00a0c9696c8f), +] +interface IAMVideoAcceleratorNotify : IUnknown +{ + HRESULT GetUncompSurfacesInfo(const GUID *accelerator, AMVAUncompBufferInfo *info); + HRESULT SetUncompSurfacesInfo(DWORD allocated_count); + HRESULT GetCreateVideoAcceleratorData(const GUID *accelerator, DWORD *size, void **data); +} diff --git a/libs/strmiids/strmiids.c b/libs/strmiids/strmiids.c index a257a23e9a4..1a7005bde3c 100644 --- a/libs/strmiids/strmiids.c +++ b/libs/strmiids/strmiids.c @@ -39,3 +39,4 @@ #include "amstream.h" #include "qedit.h" #include "vmr9.h" +#include "videoacc.h"

1 0

Zebediah Figura : quartz/tests: Test more VMR7 interfaces in all modes.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: d3e74a7270b8b918d5ddffd1ef411f2aa6e7836b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3e74a7270b8b918d5ddffd1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 13 17:02:01 2022 -0500 quartz/tests: Test more VMR7 interfaces in all modes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 71 ++++++++++++++++-------------------------------- 1 file changed, 24 insertions(+), 47 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 2cff39a867c..9049f8d726b 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -219,17 +219,13 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO IUnknown_Release(unk); } -static void test_interfaces(void) +static void test_common_interfaces(IBaseFilter *filter) { - IBaseFilter *filter = create_vmr7(0); - ULONG ref; IPin *pin; check_interface(filter, &IID_IAMCertifiedOutputProtection, TRUE); check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); - check_interface(filter, &IID_IBasicVideo, TRUE); - todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); todo_wine check_interface(filter, &IID_IKsPropertySet, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IMediaPosition, TRUE); @@ -238,12 +234,10 @@ static void test_interfaces(void) check_interface(filter, &IID_IQualityControl, TRUE); todo_wine check_interface(filter, &IID_IQualProp, TRUE); check_interface(filter, &IID_IUnknown, TRUE); - check_interface(filter, &IID_IVideoWindow, TRUE); todo_wine check_interface(filter, &IID_IVMRAspectRatioControl, TRUE); todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl, TRUE); check_interface(filter, &IID_IVMRFilterConfig, TRUE); todo_wine check_interface(filter, &IID_IVMRMixerBitmap, TRUE); - check_interface(filter, &IID_IVMRMonitorConfig, TRUE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDirectDrawVideo, FALSE); @@ -254,12 +248,9 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRDeinterlaceControl9, FALSE); check_interface(filter, &IID_IVMRFilterConfig9, FALSE); check_interface(filter, &IID_IVMRMixerBitmap9, FALSE); - check_interface(filter, &IID_IVMRMixerControl, FALSE); check_interface(filter, &IID_IVMRMixerControl9, FALSE); check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); - check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); - check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); @@ -275,8 +266,27 @@ static void test_interfaces(void) check_interface(pin, &IID_IMediaSeeking, FALSE); IPin_Release(pin); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_vmr7(0); + ULONG ref; + + test_common_interfaces(filter); + + check_interface(filter, &IID_IBasicVideo, TRUE); + todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); + check_interface(filter, &IID_IVideoWindow, TRUE); + check_interface(filter, &IID_IVMRMonitorConfig, TRUE); + + check_interface(filter, &IID_IVMRMixerControl, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); - IBaseFilter_Release(filter); filter = create_vmr7(VMRMode_Windowless); check_interface(filter, &IID_IVMRMonitorConfig, TRUE); @@ -285,28 +295,12 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); check_interface(filter, &IID_IBasicVideo2, FALSE); todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); - check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); - check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); - check_interface(filter, &IID_IVMRMixerControl9, FALSE); - check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); - check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); - - IBaseFilter_FindPin(filter, L"VMR Input0", &pin); - - check_interface(pin, &IID_IMemInputPin, TRUE); - check_interface(pin, &IID_IOverlay, TRUE); - check_interface(pin, &IID_IPin, TRUE); - todo_wine check_interface(pin, &IID_IQualityControl, TRUE); - check_interface(pin, &IID_IUnknown, TRUE); - - check_interface(pin, &IID_IKsPropertySet, FALSE); - check_interface(pin, &IID_IMediaPosition, FALSE); - check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); - IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); - IBaseFilter_Release(filter); filter = create_vmr7(VMRMode_Renderless); check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, TRUE); @@ -316,24 +310,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); - check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); - check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); check_interface(filter, &IID_IVMRWindowlessControl, FALSE); - check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); - - IBaseFilter_FindPin(filter, L"VMR Input0", &pin); - - check_interface(pin, &IID_IMemInputPin, TRUE); - check_interface(pin, &IID_IOverlay, TRUE); - check_interface(pin, &IID_IPin, TRUE); - todo_wine check_interface(pin, &IID_IQualityControl, TRUE); - check_interface(pin, &IID_IUnknown, TRUE); - - check_interface(pin, &IID_IKsPropertySet, FALSE); - check_interface(pin, &IID_IMediaPosition, FALSE); - check_interface(pin, &IID_IMediaSeeking, FALSE); - - IPin_Release(pin); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0

Zebediah Figura : quartz/tests: Check for IAMVideoAccelerator.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: fc88f4b38762eee53906eb170b93ab0bab7d8b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc88f4b38762eee53906eb17… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 13 17:02:02 2022 -0500 quartz/tests: Check for IAMVideoAccelerator. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/tests/vmr7.c | 3 +++ dlls/quartz/tests/vmr9.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 282d1ef7b12..c76dae15e91 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "dshow.h" +#include "videoacc.h" #include "wine/strmbase.h" #include "wine/test.h" @@ -89,6 +90,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IVideoWindow, TRUE); check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IAMVideoAccelerator, FALSE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDispatch, FALSE); check_interface(filter, &IID_IOverlay, FALSE); @@ -105,6 +107,7 @@ static void test_interfaces(void) todo_wine check_interface(pin, &IID_IQualityControl, TRUE); check_interface(pin, &IID_IUnknown, TRUE); + check_interface(pin, &IID_IAMVideoAccelerator, FALSE); check_interface(pin, &IID_IAsyncReader, FALSE); check_interface(pin, &IID_IMediaPosition, FALSE); check_interface(pin, &IID_IMediaSeeking, FALSE); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 9049f8d726b..5e8866de5a2 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -23,6 +23,7 @@ #include "dshow.h" #include "d3d9.h" #include "vmr9.h" +#include "videoacc.h" #include "wine/strmbase.h" #include "wine/test.h" @@ -239,6 +240,7 @@ static void test_common_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IVMRFilterConfig, TRUE); todo_wine check_interface(filter, &IID_IVMRMixerBitmap, TRUE); + check_interface(filter, &IID_IAMVideoAccelerator, FALSE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDirectDrawVideo, FALSE); check_interface(filter, &IID_IPersistPropertyBag, FALSE); @@ -255,6 +257,7 @@ static void test_common_interfaces(IBaseFilter *filter) IBaseFilter_FindPin(filter, L"VMR Input0", &pin); + todo_wine check_interface(pin, &IID_IAMVideoAccelerator, TRUE); check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IOverlay, TRUE); check_interface(pin, &IID_IPin, TRUE); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 151c68cf6af..4fd8f35d4f8 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -27,6 +27,7 @@ #include "qedit.h" #include "d3d9.h" #include "vmr9.h" +#include "videoacc.h" #include "wmcodecdsp.h" #include "wine/strmbase.h" #include "wine/test.h" @@ -246,6 +247,7 @@ static void test_common_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IVMRFilterConfig9, TRUE); check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); + check_interface(filter, &IID_IAMVideoAccelerator, FALSE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDirectDrawVideo, FALSE); check_interface(filter, &IID_IPersistPropertyBag, FALSE); @@ -262,6 +264,7 @@ static void test_common_interfaces(IBaseFilter *filter) IBaseFilter_FindPin(filter, L"VMR Input0", &pin); + todo_wine check_interface(pin, &IID_IAMVideoAccelerator, TRUE); check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IOverlay, TRUE); check_interface(pin, &IID_IPin, TRUE);

1 0

Zebediah Figura : quartz/vmr9: Stub IAMVideoAccelerator.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: d0b400c945b41abcb311be9b8eefc52c085f2e43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0b400c945b41abcb311be9b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 13 17:02:03 2022 -0500 quartz/vmr9: Stub IAMVideoAccelerator. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 142 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 5e8866de5a2..88c82bec0d3 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -257,7 +257,7 @@ static void test_common_interfaces(IBaseFilter *filter) IBaseFilter_FindPin(filter, L"VMR Input0", &pin); - todo_wine check_interface(pin, &IID_IAMVideoAccelerator, TRUE); + check_interface(pin, &IID_IAMVideoAccelerator, TRUE); check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IOverlay, TRUE); check_interface(pin, &IID_IPin, TRUE); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 4fd8f35d4f8..405f7ee89ba 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -264,7 +264,7 @@ static void test_common_interfaces(IBaseFilter *filter) IBaseFilter_FindPin(filter, L"VMR Input0", &pin); - todo_wine check_interface(pin, &IID_IAMVideoAccelerator, TRUE); + check_interface(pin, &IID_IAMVideoAccelerator, TRUE); check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IOverlay, TRUE); check_interface(pin, &IID_IPin, TRUE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 4b213d57426..2330f8fc0c9 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -33,6 +33,7 @@ #include "ddraw.h" #include "dvdmedia.h" #include "d3d9.h" +#include "videoacc.h" #include "vmr9.h" #include "wine/debug.h" @@ -78,6 +79,7 @@ struct quartz_vmr * Native uses a separate reference count for IVMRSurfaceAllocatorNotify9. */ LONG IVMRSurfaceAllocatorNotify9_refcount; + IAMVideoAccelerator IAMVideoAccelerator_iface; IOverlay IOverlay_iface; IVMRSurfaceAllocator9 *allocator; @@ -610,7 +612,9 @@ static HRESULT vmr_pin_query_interface(struct strmbase_renderer *iface, REFIID i { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); - if (IsEqualGUID(iid, &IID_IOverlay)) + if (IsEqualGUID(iid, &IID_IAMVideoAccelerator)) + *out = &filter->IAMVideoAccelerator_iface; + else if (IsEqualGUID(iid, &IID_IOverlay)) *out = &filter->IOverlay_iface; else return E_NOINTERFACE; @@ -2430,6 +2434,139 @@ static const IVMRAspectRatioControl9Vtbl aspect_ratio_control9_vtbl = aspect_ratio_control9_SetAspectRatioMode, }; +static struct quartz_vmr *impl_from_IAMVideoAccelerator(IAMVideoAccelerator *iface) +{ + return CONTAINING_RECORD(iface, struct quartz_vmr, IAMVideoAccelerator_iface); +} + +static HRESULT WINAPI video_accelerator_QueryInterface(IAMVideoAccelerator *iface, REFIID iid, void **out) +{ + struct quartz_vmr *filter = impl_from_IAMVideoAccelerator(iface); + return IPin_QueryInterface(&filter->renderer.sink.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI video_accelerator_AddRef(IAMVideoAccelerator *iface) +{ + struct quartz_vmr *filter = impl_from_IAMVideoAccelerator(iface); + return IPin_AddRef(&filter->renderer.sink.pin.IPin_iface); +} + +static ULONG WINAPI video_accelerator_Release(IAMVideoAccelerator *iface) +{ + struct quartz_vmr *filter = impl_from_IAMVideoAccelerator(iface); + return IPin_Release(&filter->renderer.sink.pin.IPin_iface); +} + +static HRESULT WINAPI video_accelerator_GetVideoAcceleratorGUIDs( + IAMVideoAccelerator *iface, DWORD *count, GUID *accelerators) +{ + FIXME("iface %p, count %p, accelerators %p, stub!\n", iface, count, accelerators); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_GetUncompFormatsSupported(IAMVideoAccelerator *iface, + const GUID *accelerator, DWORD *count, DDPIXELFORMAT *formats) +{ + FIXME("iface %p, accelerator %s, count %p, formats %p, stub!\n", + iface, debugstr_guid(accelerator), count, formats); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_GetInternalMemInfo(IAMVideoAccelerator *iface, + const GUID *accelerator, const AMVAUncompDataInfo *format_info, AMVAInternalMemInfo *mem_info) +{ + FIXME("iface %p, accelerator %s, format_info %p, mem_info %p, stub!\n", + iface, debugstr_guid(accelerator), format_info, mem_info); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_GetCompBufferInfo(IAMVideoAccelerator *iface, + const GUID *accelerator, const AMVAUncompDataInfo *uncompressed_info, + DWORD *compressed_info_count, AMVACompBufferInfo *compressed_infos) +{ + FIXME("iface %p, accelerator %s, uncompressed_info %p, compressed_info_count %p, compressed_infos %p, stub!\n", + iface, debugstr_guid(accelerator), uncompressed_info, compressed_info_count, compressed_infos); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_GetInternalCompBufferInfo( + IAMVideoAccelerator *iface, DWORD *count, AMVACompBufferInfo *infos) +{ + FIXME("iface %p, count %p, infos %p, stub!\n", iface, count, infos); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_BeginFrame(IAMVideoAccelerator *iface, const AMVABeginFrameInfo *info) +{ + FIXME("iface %p, info %p, stub!\n", iface, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_EndFrame(IAMVideoAccelerator *iface, const AMVAEndFrameInfo *info) +{ + FIXME("iface %p, info %p, stub!\n", iface, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_GetBuffer(IAMVideoAccelerator *iface, + DWORD type_index, DWORD buffer_index, BOOL read_only, void **buffer, LONG *stride) +{ + FIXME("iface %p, type_index %lu, buffer_index %lu, read_only %d, buffer %p, stride %p, stub!\n", + iface, type_index, buffer_index, read_only, buffer, stride); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_ReleaseBuffer( + IAMVideoAccelerator *iface, DWORD type_index, DWORD buffer_index) +{ + FIXME("iface %p, type_index %lu, buffer_index %lu, stub!\n", iface, type_index, buffer_index); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_Execute(IAMVideoAccelerator *iface, + DWORD function, void *in_data, DWORD in_size, void *out_data, + DWORD out_size, DWORD buffer_count, const AMVABUFFERINFO *buffers) +{ + FIXME("iface %p, function %#lx, in_data %p, in_size %lu," + " out_data %p, out_size %lu, buffer_count %lu, buffers %p, stub!\n", + iface, function, in_data, in_size, out_data, out_size, buffer_count, buffers); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_QueryRenderStatus(IAMVideoAccelerator *iface, + DWORD type_index, DWORD buffer_index, DWORD flags) +{ + FIXME("iface %p, type_index %lu, buffer_index %lu, flags %#lx, stub!\n", + iface, type_index, buffer_index, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_DisplayFrame( + IAMVideoAccelerator *iface, DWORD index, IMediaSample *sample) +{ + FIXME("iface %p, index %lu, sample %p, stub!\n", iface, index, sample); + return E_NOTIMPL; +} + +static const IAMVideoAcceleratorVtbl video_accelerator_vtbl = +{ + video_accelerator_QueryInterface, + video_accelerator_AddRef, + video_accelerator_Release, + video_accelerator_GetVideoAcceleratorGUIDs, + video_accelerator_GetUncompFormatsSupported, + video_accelerator_GetInternalMemInfo, + video_accelerator_GetCompBufferInfo, + video_accelerator_GetInternalCompBufferInfo, + video_accelerator_BeginFrame, + video_accelerator_EndFrame, + video_accelerator_GetBuffer, + video_accelerator_ReleaseBuffer, + video_accelerator_Execute, + video_accelerator_QueryRenderStatus, + video_accelerator_DisplayFrame, +}; + static inline struct quartz_vmr *impl_from_IOverlay(IOverlay *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, IOverlay_iface); @@ -2567,6 +2704,8 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->IVMRSurfaceAllocatorNotify9_iface.lpVtbl = &VMR9_SurfaceAllocatorNotify_Vtbl; object->IVMRWindowlessControl_iface.lpVtbl = &VMR7_WindowlessControl_Vtbl; object->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; + + object->IAMVideoAccelerator_iface.lpVtbl = &video_accelerator_vtbl; object->IOverlay_iface.lpVtbl = &overlay_vtbl; video_window_init(&object->window, &IVideoWindow_VTable,

1 0

Alexandre Julliard : ole32: Fix sign expansion of codepage values.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: 1f71ea3106d41a0cc392fc626a3ecd7c890425fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f71ea3106d41a0cc392fc62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 14 09:44:16 2022 +0200 ole32: Fix sign expansion of codepage values. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 28793d7cbd5..8efb8ed5543 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -802,7 +802,7 @@ static HRESULT WINAPI IPropertyStorage_fnWriteMultiple( if (dictionary_num_entries(This->propid_to_prop) == 0 && rgpropvar[i].vt == VT_I2) { - This->codePage = rgpropvar[i].iVal; + This->codePage = (USHORT)rgpropvar[i].iVal; if (This->codePage == CP_UNICODE) This->grfFlags &= ~PROPSETFLAG_ANSI; else @@ -1868,7 +1868,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) { case PID_CODEPAGE: if (prop.vt == VT_I2) - This->codePage = (UINT)prop.iVal; + This->codePage = (USHORT)prop.iVal; break; case PID_LOCALE: if (prop.vt == VT_I4)

1 0

Alexandre Julliard : user32: Pass a valid length to RtlUnicodeToMultiByteN/RtlMultiByteToUnicodeN.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: dee9a361c74d150bd04017bcc938ec49d8f5fb27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dee9a361c74d150bd04017bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 14 09:44:41 2022 +0200 user32: Pass a valid length to RtlUnicodeToMultiByteN/RtlMultiByteToUnicodeN. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 7b9b2000c06..9e90906bc5d 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -373,7 +373,7 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, if (*result >= 0) { DWORD len; - RtlUnicodeToMultiByteN( (LPSTR)lParam, ~0u, &len, + RtlUnicodeToMultiByteN( (LPSTR)lParam, 512 * 3, &len, buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR) ); *result = len - 1; } @@ -633,7 +633,7 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN if (*result >= 0) { DWORD len; - RtlMultiByteToUnicodeN( (LPWSTR)lParam, ~0u, &len, buffer, strlen(buffer) + 1 ); + RtlMultiByteToUnicodeN( (LPWSTR)lParam, 512 * 3, &len, buffer, strlen(buffer) + 1 ); *result = len / sizeof(WCHAR) - 1; } }

1 0

Alexandre Julliard : user32/tests: Fix some tests that break in UTF-8 codepage.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: 86b063c1a912beea24aeafdd94c5d4a8d2c68271 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86b063c1a912beea24aeafdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 14 11:34:21 2022 +0200 user32/tests: Fix some tests that break in UTF-8 codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/resource.c | 8 ++++---- dlls/user32/tests/wsprintf.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 97c274c7817..fff962b955c 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -172,11 +172,11 @@ static void test_accel1(void) ac[n++].fVirt = (SHORT) 0xffff; ac[n].cmd = 0xfff0; - ac[n].key = 0xffff; + ac[n].key = 'B'; ac[n++].fVirt = (SHORT) 0xfff0; ac[n].cmd = 0xfff0; - ac[n].key = 0xffff; + ac[n].key = 'C'; ac[n++].fVirt = 0x0000; ac[n].cmd = 0xfff0; @@ -204,12 +204,12 @@ static void test_accel1(void) if (++n == r) goto done; ok( ac[n].cmd == 0xfff0, "cmd 2 not preserved got %x\n", ac[n].cmd); - ok( (ac[n].key & 0xff) == 0xff, "key 2 not preserved got %x\n", ac[n].key); + ok( ac[n].key == 'B', "key 2 not preserved got %x\n", ac[n].key); ok( ac[n].fVirt == 0x0070, "fVirt 2 wrong got %x\n", ac[n].fVirt); if (++n == r) goto done; ok( ac[n].cmd == 0xfff0, "cmd 3 not preserved got %x\n", ac[n].cmd); - ok( (ac[n].key & 0xff) == 0xff, "key 3 not preserved got %x\n", ac[n].key); + ok( ac[n].key == 'C', "key 3 not preserved got %x\n", ac[n].key); ok( ac[n].fVirt == 0x0000, "fVirt 3 wrong got %x\n", ac[n].fVirt); if (++n == r) goto done; diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index f46cfa5aea3..d35138f4087 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -95,7 +95,7 @@ static void wsprintfATest(void) ok(!strcmp(buf, i64_formats[i].res), "%u: wrong result [%s]\n", i, buf); } - if (!GetCPInfo(CP_ACP, &cpinfo) || cpinfo.MaxCharSize <= 1) + if (!GetCPInfo(CP_ACP, &cpinfo) || cpinfo.MaxCharSize != 2) { skip("Multi-byte wsprintfA test isn't available for the current codepage\n"); return; @@ -199,7 +199,7 @@ static void wsprintfWTest(void) ok(buf[0] == L' ', "expected \\x0020, got \\x%04x\n", buf[0]); ok(buf[1] == wc99, "expected \\x%04x, got \\x%04x\n", wc99, buf[1]); - if (!GetCPInfoExW(CP_ACP, 0, &cpinfoex) || cpinfoex.MaxCharSize <= 1) + if (!GetCPInfoExW(CP_ACP, 0, &cpinfoex) || cpinfoex.MaxCharSize != 2) { skip("Multi-byte wsprintfW test isn't available for the current codepage\n"); return;

1 0

Paul Gofman : crypt32: Support CERT_QUERY_OBJECT_BLOB in CRYPT_QueryEmbeddedMessageObject().
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: a6ea269a96f1a6b8f31d130e3f64036018974bb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6ea269a96f1a6b8f31d130e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 13 17:00:35 2022 +0300 crypt32: Support CERT_QUERY_OBJECT_BLOB in CRYPT_QueryEmbeddedMessageObject(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/object.c | 40 +++++++++++-- dlls/crypt32/tests/object.c | 140 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6ea269a96f1a6b8f31d…

1 0