[PATCH v5 0/2] MR2620: include: Add windows.ui.composition.interop.idl file.
Needed for mingw Firefox build. The WIDL error points to the wrong function, specifically the one after it. include/windows.ui.composition.interop.idl:35:63: error: parameter 'swapchain' of function 'CreateCompositionSurfaceForHandle' cannot derive from void * HRESULT CreateCompositionSurfaceForSwapChain([in] IUnknown *swapchain, [out, retval] ICompositionSurface **result); ^ make[1]: *** [Makefile:163749: include/windows.ui.composition.interop.h] Error 1 -- v5: include: Add windows.ui.composition.interop.idl file. widl: Add support for WinRT HANDLE parameter type. https://gitlab.winehq.org/wine/wine/-/merge_requests/2620
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Needed by windows.ui.composition.interop.idl. --- tools/widl/parser.y | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9b81f9521fa..b802f75874d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2481,8 +2481,12 @@ static void check_field_common(const type_t *container_type, break; } case TGT_POINTER: - type = type_pointer_get_ref_type(type); - more_to_do = TRUE; + if (type_get_type(type_pointer_get_ref_type(type)) != TYPE_VOID || + !type->name || strcmp(type->name, "HANDLE")) + { + type = type_pointer_get_ref_type(type); + more_to_do = TRUE; + } break; case TGT_ARRAY: type = type_array_get_element_type(type); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2620
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Needed for mingw Firefox build. --- include/Makefile.in | 1 + include/windows.ui.composition.interop.idl | 40 ++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 include/windows.ui.composition.interop.idl diff --git a/include/Makefile.in b/include/Makefile.in index f52314e745d..54d6dca234d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -838,6 +838,7 @@ SOURCES = \ windows.system.threading.idl \ windows.system.userprofile.idl \ windows.ui.composition.idl \ + windows.ui.composition.interop.idl \ windows.ui.core.idl \ windows.ui.idl \ windows.ui.viewmanagement.idl \ diff --git a/include/windows.ui.composition.interop.idl b/include/windows.ui.composition.interop.idl new file mode 100644 index 00000000000..cde3e62f533 --- /dev/null +++ b/include/windows.ui.composition.interop.idl @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "windows.ui.composition.idl"; +import "sdkddkver.h"; + +namespace Windows.UI.Composition { + interface ICompositorInterop; + + [ + object, + uuid(25297d5c-3ad4-4c9c-b5cf-e36a38512330), + pointer_default(unique) + ] + interface ICompositorInterop : IInspectable + { + HRESULT CreateCompositionSurfaceForHandle([in] HANDLE swapchain, [out, retval] ICompositionSurface **result); + HRESULT CreateCompositionSurfaceForSwapChain([in] IUnknown *swapchain, [out, retval] ICompositionSurface **result); + HRESULT CreateGraphicsDevice([in] IUnknown *device, [out, retval] ICompositionGraphicsDevice **result); + }; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2620
participants (2)
-
Mohamad Al-Jaf -
Mohamad Al-Jaf (＠maljaf)