wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Anton Baskanov : winegstreamer: Add a skeleton MPEG layer-3 decoder filter.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: 642c090df35d80664a92bbd6e10cf1db195d7b2c URL: https://gitlab.winehq.org/wine/wine/-/commit/642c090df35d80664a92bbd6e10cf1… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Oct 2 18:32:05 2022 +0700 winegstreamer: Add a skeleton MPEG layer-3 decoder filter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18773 Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/winegstreamer/gst_guids.h | 1 + dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 3 ++ dlls/winegstreamer/quartz_transform.c | 46 ++++++++++++++++++++++++++++ dlls/winegstreamer/winegstreamer_classes.idl | 7 +++++ 5 files changed, 58 insertions(+) diff --git a/dlls/winegstreamer/gst_guids.h b/dlls/winegstreamer/gst_guids.h index ea859586d7f..313066fa4d8 100644 --- a/dlls/winegstreamer/gst_guids.h +++ b/dlls/winegstreamer/gst_guids.h @@ -20,4 +20,5 @@ */ DEFINE_GUID(CLSID_decodebin_parser, 0xf9d8d64e, 0xa144, 0x47dc, 0x8e, 0xe0, 0xf5, 0x34, 0x98, 0x37, 0x2c, 0x29); +DEFINE_GUID(CLSID_mpeg_layer3_decoder, 0x38be3000, 0xdbf4, 0x11d0, 0x86, 0x0e, 0x00, 0xa0, 0x24, 0xcf, 0xef, 0x6d); DEFINE_GUID(WINESUBTYPE_Gstreamer, 0xffffffff, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index c33a89afd5b..5707ef423fc 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -109,6 +109,7 @@ unsigned int wg_format_get_max_size(const struct wg_format *format); HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out); HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out); HRESULT mpeg_audio_codec_create(IUnknown *outer, IUnknown **out); +HRESULT mpeg_layer3_decoder_create(IUnknown *outer, IUnknown **out); HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out); HRESULT wave_parser_create(IUnknown *outer, IUnknown **out); HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 2efa3bd26ac..32964c0effc 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -450,6 +450,7 @@ static const IClassFactoryVtbl class_factory_vtbl = static struct class_factory avi_splitter_cf = {{&class_factory_vtbl}, avi_splitter_create}; static struct class_factory decodebin_parser_cf = {{&class_factory_vtbl}, decodebin_parser_create}; static struct class_factory mpeg_audio_codec_cf = {{&class_factory_vtbl}, mpeg_audio_codec_create}; +static struct class_factory mpeg_layer3_decoder_cf = {{&class_factory_vtbl}, mpeg_layer3_decoder_create}; static struct class_factory mpeg_splitter_cf = {{&class_factory_vtbl}, mpeg_splitter_create}; static struct class_factory wave_parser_cf = {{&class_factory_vtbl}, wave_parser_create}; static struct class_factory wma_decoder_cf = {{&class_factory_vtbl}, wma_decoder_create}; @@ -476,6 +477,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) factory = &decodebin_parser_cf; else if (IsEqualGUID(clsid, &CLSID_CMpegAudioCodec)) factory = &mpeg_audio_codec_cf; + else if (IsEqualGUID(clsid, &CLSID_mpeg_layer3_decoder)) + factory = &mpeg_layer3_decoder_cf; else if (IsEqualGUID(clsid, &CLSID_MPEG1Splitter)) factory = &mpeg_splitter_cf; else if (IsEqualGUID(clsid, &CLSID_WAVEParser)) diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 9a713b120d2..79b3a8af89b 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -19,6 +19,7 @@ */ #include "gst_private.h" +#include "gst_guids.h" #include "mferror.h" #include "mpegtype.h" @@ -733,3 +734,48 @@ HRESULT mpeg_audio_codec_create(IUnknown *outer, IUnknown **out) *out = &object->filter.IUnknown_inner; return hr; } + +static HRESULT mpeg_layer3_decoder_sink_query_accept(struct transform *filter, const AM_MEDIA_TYPE *mt) +{ + return S_OK; +} + +static HRESULT mpeg_layer3_decoder_source_query_accept(struct transform *filter, const AM_MEDIA_TYPE *mt) +{ + return S_OK; +} + +static HRESULT mpeg_layer3_decoder_source_get_media_type(struct transform *filter, unsigned int index, AM_MEDIA_TYPE *mt) +{ + return VFW_S_NO_MORE_ITEMS; +} + +static HRESULT mpeg_layer3_decoder_source_decide_buffer_size(struct transform *filter, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props) +{ + return S_OK; +} + +static const struct transform_ops mpeg_layer3_decoder_transform_ops = +{ + mpeg_layer3_decoder_sink_query_accept, + mpeg_layer3_decoder_source_query_accept, + mpeg_layer3_decoder_source_get_media_type, + mpeg_layer3_decoder_source_decide_buffer_size, +}; + +HRESULT mpeg_layer3_decoder_create(IUnknown *outer, IUnknown **out) +{ + struct transform *object; + HRESULT hr; + + hr = transform_create(outer, &CLSID_mpeg_layer3_decoder, &mpeg_layer3_decoder_transform_ops, &object); + if (FAILED(hr)) + return hr; + + wcscpy(object->sink.pin.name, L"XForm In"); + wcscpy(object->source.pin.name, L"XForm Out"); + + TRACE("Created MPEG layer-3 decoder %p.\n", object); + *out = &object->filter.IUnknown_inner; + return hr; +} diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl index ae258f1c2ec..30a99c9acfb 100644 --- a/dlls/winegstreamer/winegstreamer_classes.idl +++ b/dlls/winegstreamer/winegstreamer_classes.idl @@ -35,6 +35,13 @@ coclass AviSplitter {} ] coclass CMpegAudioCodec {} +[ + helpstring("MPEG Layer-3 Decoder"), + threading(both), + uuid(38be3000-dbf4-11d0-860e-00a024cfef6d) +] +coclass mpeg_layer3_decoder {} + [ helpstring("MPEG-I Stream Splitter"), threading(both),

1 0

Anton Baskanov : quartz/tests: Add tests for MPEG layer-3 decoder IEnumMediaTypes.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: a490e819f8c2d1c9e1d598608c09ade1d3b8b6f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/a490e819f8c2d1c9e1d598608c09ad… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Oct 2 19:26:41 2022 +0700 quartz/tests: Add tests for MPEG layer-3 decoder IEnumMediaTypes. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/mpeglayer3.c | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/quartz/tests/mpeglayer3.c b/dlls/quartz/tests/mpeglayer3.c index 66ef86e2b90..66feb35b577 100644 --- a/dlls/quartz/tests/mpeglayer3.c +++ b/dlls/quartz/tests/mpeglayer3.c @@ -488,6 +488,81 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +static void test_enum_media_types(void) +{ + IBaseFilter *filter = create_mpeg_layer3_decoder(); + IEnumMediaTypes *enum1, *enum2; + AM_MEDIA_TYPE *mts[1]; + ULONG ref, count; + HRESULT hr; + IPin *pin; + + IBaseFilter_FindPin(filter, L"In", &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(!count, "Got count %lu.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, L"Out", &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(!count, "Got count %lu.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + START_TEST(mpeglayer3) { IBaseFilter *filter; @@ -508,6 +583,7 @@ START_TEST(mpeglayer3) test_enum_pins(); test_find_pin(); test_pin_info(); + test_enum_media_types(); CoUninitialize(); }

1 0

Mohamad Al-Jaf : certutil: Add stub program.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: 21ae94d437cdd006f56c2261b40ea0f6a42837da URL: https://gitlab.winehq.org/wine/wine/-/commit/21ae94d437cdd006f56c2261b40ea0… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Nov 7 03:53:26 2022 -0500 certutil: Add stub program. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53086 --- configure | 2 ++ configure.ac | 1 + programs/certutil/Makefile.in | 6 ++++++ programs/certutil/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) diff --git a/configure b/configure index e4b804f1525..76ac7311e6d 100755 --- a/configure +++ b/configure @@ -1583,6 +1583,7 @@ enable_aspnet_regiis enable_attrib enable_cabarc enable_cacls +enable_certutil enable_chcp_com enable_clock enable_cmd @@ -22275,6 +22276,7 @@ wine_fn_config_makefile programs/aspnet_regiis enable_aspnet_regiis wine_fn_config_makefile programs/attrib enable_attrib wine_fn_config_makefile programs/cabarc enable_cabarc wine_fn_config_makefile programs/cacls enable_cacls +wine_fn_config_makefile programs/certutil enable_certutil wine_fn_config_makefile programs/chcp.com enable_chcp_com wine_fn_config_makefile programs/clock enable_clock wine_fn_config_makefile programs/cmd enable_cmd diff --git a/configure.ac b/configure.ac index 169299da237..423f883b6a8 100644 --- a/configure.ac +++ b/configure.ac @@ -3369,6 +3369,7 @@ WINE_CONFIG_MAKEFILE(programs/aspnet_regiis) WINE_CONFIG_MAKEFILE(programs/attrib) WINE_CONFIG_MAKEFILE(programs/cabarc) WINE_CONFIG_MAKEFILE(programs/cacls) +WINE_CONFIG_MAKEFILE(programs/certutil) WINE_CONFIG_MAKEFILE(programs/chcp.com) WINE_CONFIG_MAKEFILE(programs/clock) WINE_CONFIG_MAKEFILE(programs/cmd) diff --git a/programs/certutil/Makefile.in b/programs/certutil/Makefile.in new file mode 100644 index 00000000000..69a585a245d --- /dev/null +++ b/programs/certutil/Makefile.in @@ -0,0 +1,6 @@ +MODULE = certutil.exe + +EXTRADLLFLAGS = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/certutil/main.c b/programs/certutil/main.c new file mode 100644 index 00000000000..2b94819fb00 --- /dev/null +++ b/programs/certutil/main.c @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2022 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 + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(certutil); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Mohamad Al-Jaf : setx: Add stub program.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: 82e8d6036fd26485db32f2f88ebb7d7b4f6b2f9a URL: https://gitlab.winehq.org/wine/wine/-/commit/82e8d6036fd26485db32f2f88ebb7d… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Nov 7 02:34:49 2022 -0500 setx: Add stub program. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53755 --- configure | 2 ++ configure.ac | 1 + programs/setx/Makefile.in | 9 +++++++++ programs/setx/main.c | 33 +++++++++++++++++++++++++++++++++ programs/setx/version.rc | 27 +++++++++++++++++++++++++++ 5 files changed, 72 insertions(+) diff --git a/configure b/configure index ce217cb9fd2..e4b804f1525 100755 --- a/configure +++ b/configure @@ -1641,6 +1641,7 @@ enable_sdbinst enable_secedit enable_servicemodelreg enable_services +enable_setx enable_shutdown enable_spoolsv enable_start @@ -22342,6 +22343,7 @@ wine_fn_config_makefile programs/secedit enable_secedit wine_fn_config_makefile programs/servicemodelreg enable_servicemodelreg wine_fn_config_makefile programs/services enable_services wine_fn_config_makefile programs/services/tests enable_tests +wine_fn_config_makefile programs/setx enable_setx wine_fn_config_makefile programs/shutdown enable_shutdown wine_fn_config_makefile programs/spoolsv enable_spoolsv wine_fn_config_makefile programs/start enable_start diff --git a/configure.ac b/configure.ac index 2907dbd7d84..169299da237 100644 --- a/configure.ac +++ b/configure.ac @@ -3437,6 +3437,7 @@ WINE_CONFIG_MAKEFILE(programs/secedit) WINE_CONFIG_MAKEFILE(programs/servicemodelreg) WINE_CONFIG_MAKEFILE(programs/services) WINE_CONFIG_MAKEFILE(programs/services/tests) +WINE_CONFIG_MAKEFILE(programs/setx) WINE_CONFIG_MAKEFILE(programs/shutdown) WINE_CONFIG_MAKEFILE(programs/spoolsv) WINE_CONFIG_MAKEFILE(programs/start) diff --git a/programs/setx/Makefile.in b/programs/setx/Makefile.in new file mode 100644 index 00000000000..1a556abd511 --- /dev/null +++ b/programs/setx/Makefile.in @@ -0,0 +1,9 @@ +MODULE = setx.exe + +EXTRADLLFLAGS = -mconsole -municode + +C_SRCS = \ + main.c + +RC_SRCS = \ + version.rc diff --git a/programs/setx/main.c b/programs/setx/main.c new file mode 100644 index 00000000000..8b6ea45c76d --- /dev/null +++ b/programs/setx/main.c @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2022 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 + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(setx); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/programs/setx/version.rc b/programs/setx/version.rc new file mode 100644 index 00000000000..e8c6324aaac --- /dev/null +++ b/programs/setx/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2022 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine setx" +#define WINE_FILENAME_STR "setx.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 10,0,19041,1 +#define WINE_FILEVERSION_STR "10.0.19041.1" +#define WINE_PRODUCTVERSION 10,0,19041,1 +#define WINE_PRODUCTVERSION_STR "10.0.19041.1" + +#include "wine/wine_common_ver.rc"

1 0

Jacek Caban : winevulkan: Support output dynamic array conversion.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: f3bf30688cb25b6ae4fac4cdcb18469042fbbf32 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3bf30688cb25b6ae4fac4cdcb1846… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 6 19:17:27 2022 +0100 winevulkan: Support output dynamic array conversion. --- dlls/winevulkan/make_vulkan | 14 +++------ dlls/winevulkan/vulkan_thunks.c | 63 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 10 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 8bc6ec6daa8..c7f422c3c64 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1310,12 +1310,12 @@ class VkMember(VkVariable): win_type = "win32" if conv else "win64" if self.needs_conversion(conv, unwrap, direction, False): if self.is_dynamic_array(): + # Array length is either a variable name (string) or an int. + count = self.dyn_array_len if isinstance(self.dyn_array_len, int) else "{0}{1}".format(input, self.dyn_array_len) + host_part = "host" if unwrap else "unwrapped_host" if direction == Direction.OUTPUT: - LOGGER.warn("TODO: implement copying of returnedonly dynamic array for {0}.{1}".format(self.type, self.name)) + return "convert_{2}_array_{6}_to_{5}({3}{1}, {0}{1}, {4});\n".format(output, self.name, self.type, input, count, win_type, host_part) else: - # Array length is either a variable name (string) or an int. - count = self.dyn_array_len if isinstance(self.dyn_array_len, int) else "{0}{1}".format(input, self.dyn_array_len) - host_part = "host" if unwrap else "unwrapped_host" return "{0}{1} = convert_{2}_array_{5}_to_{6}(ctx, {3}{1}, {4});\n".format(output, self.name, self.type, input, count, win_type, host_part) elif self.is_static_array(): count = self.array_len @@ -1902,12 +1902,6 @@ class VkStruct(Sequence): if self.name in ["VkSparseImageMemoryRequirements", "VkSparseImageMemoryRequirements2"]: return False - # FIXME: we can't handle output dynamic arrays yet, remove once we can handle it - if direction == Direction.OUTPUT and self.name in ["VkDeviceFaultInfoEXT", - "VkDeviceFaultAddressInfoEXT", - "VkDeviceFaultVendorInfoEXT"]: - return False - # pFixedRateFlags field is missing const, but it doesn't need output conversion if direction == Direction.OUTPUT and self.name == "VkImageCompressionControlEXT": return False diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 6d5fe3d4699..c01801f80e7 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -5802,6 +5802,17 @@ static inline void convert_VkDeviceFaultAddressInfoEXT_win32_to_host(const VkDev } #endif /* USE_STRUCT_CONVERSION */ +#if defined(USE_STRUCT_CONVERSION) +static inline void convert_VkDeviceFaultAddressInfoEXT_host_to_win32(const VkDeviceFaultAddressInfoEXT_host *in, VkDeviceFaultAddressInfoEXT *out) +{ + if (!in) return; + + out->addressType = in->addressType; + out->reportedAddress = in->reportedAddress; + out->addressPrecision = in->addressPrecision; +} +#endif /* USE_STRUCT_CONVERSION */ + #if defined(USE_STRUCT_CONVERSION) static inline VkDeviceFaultAddressInfoEXT_host *convert_VkDeviceFaultAddressInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultAddressInfoEXT *in, uint32_t count) { @@ -5820,6 +5831,20 @@ static inline VkDeviceFaultAddressInfoEXT_host *convert_VkDeviceFaultAddressInfo } #endif /* USE_STRUCT_CONVERSION */ +#if defined(USE_STRUCT_CONVERSION) +static inline void convert_VkDeviceFaultAddressInfoEXT_array_host_to_win32(const VkDeviceFaultAddressInfoEXT_host *in, VkDeviceFaultAddressInfoEXT *out, uint32_t count) +{ + unsigned int i; + + if (!in) return; + + for (i = 0; i < count; i++) + { + convert_VkDeviceFaultAddressInfoEXT_host_to_win32(&in[i], &out[i]); + } +} +#endif /* USE_STRUCT_CONVERSION */ + #if defined(USE_STRUCT_CONVERSION) static inline void convert_VkDeviceFaultVendorInfoEXT_win32_to_host(const VkDeviceFaultVendorInfoEXT *in, VkDeviceFaultVendorInfoEXT_host *out) { @@ -5831,6 +5856,17 @@ static inline void convert_VkDeviceFaultVendorInfoEXT_win32_to_host(const VkDevi } #endif /* USE_STRUCT_CONVERSION */ +#if defined(USE_STRUCT_CONVERSION) +static inline void convert_VkDeviceFaultVendorInfoEXT_host_to_win32(const VkDeviceFaultVendorInfoEXT_host *in, VkDeviceFaultVendorInfoEXT *out) +{ + if (!in) return; + + memcpy(out->description, in->description, VK_MAX_DESCRIPTION_SIZE * sizeof(char)); + out->vendorFaultCode = in->vendorFaultCode; + out->vendorFaultData = in->vendorFaultData; +} +#endif /* USE_STRUCT_CONVERSION */ + #if defined(USE_STRUCT_CONVERSION) static inline VkDeviceFaultVendorInfoEXT_host *convert_VkDeviceFaultVendorInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultVendorInfoEXT *in, uint32_t count) { @@ -5849,6 +5885,20 @@ static inline VkDeviceFaultVendorInfoEXT_host *convert_VkDeviceFaultVendorInfoEX } #endif /* USE_STRUCT_CONVERSION */ +#if defined(USE_STRUCT_CONVERSION) +static inline void convert_VkDeviceFaultVendorInfoEXT_array_host_to_win32(const VkDeviceFaultVendorInfoEXT_host *in, VkDeviceFaultVendorInfoEXT *out, uint32_t count) +{ + unsigned int i; + + if (!in) return; + + for (i = 0; i < count; i++) + { + convert_VkDeviceFaultVendorInfoEXT_host_to_win32(&in[i], &out[i]); + } +} +#endif /* USE_STRUCT_CONVERSION */ + #if defined(USE_STRUCT_CONVERSION) static inline void convert_VkDeviceFaultInfoEXT_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultInfoEXT *in, VkDeviceFaultInfoEXT_host *out) { @@ -5863,6 +5913,18 @@ static inline void convert_VkDeviceFaultInfoEXT_win32_to_host(struct conversion_ } #endif /* USE_STRUCT_CONVERSION */ +#if defined(USE_STRUCT_CONVERSION) +static inline void convert_VkDeviceFaultInfoEXT_host_to_win32(const VkDeviceFaultInfoEXT_host *in, VkDeviceFaultInfoEXT *out) +{ + if (!in) return; + + memcpy(out->description, in->description, VK_MAX_DESCRIPTION_SIZE * sizeof(char)); + convert_VkDeviceFaultAddressInfoEXT_array_host_to_win32(in->pAddressInfos, out->pAddressInfos, 1); + convert_VkDeviceFaultVendorInfoEXT_array_host_to_win32(in->pVendorInfos, out->pVendorInfos, 1); + out->pVendorBinaryData = in->pVendorBinaryData; +} +#endif /* USE_STRUCT_CONVERSION */ + #if defined(USE_STRUCT_CONVERSION) static inline void convert_VkDeviceMemoryOpaqueCaptureAddressInfo_win32_to_host(const VkDeviceMemoryOpaqueCaptureAddressInfo *in, VkDeviceMemoryOpaqueCaptureAddressInfo_host *out) { @@ -16938,6 +17000,7 @@ static NTSTATUS thunk32_vkGetDeviceFaultInfoEXT(void *args) convert_VkDeviceFaultInfoEXT_win32_to_host(&ctx, params->pFaultInfo, &pFaultInfo_host); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceFaultInfoEXT(wine_device_from_handle(params->device)->device, &pFaultCounts_host, &pFaultInfo_host); convert_VkDeviceFaultCountsEXT_host_to_win32(&pFaultCounts_host, params->pFaultCounts); + convert_VkDeviceFaultInfoEXT_host_to_win32(&pFaultInfo_host, params->pFaultInfo); free_conversion_context(&ctx); return STATUS_SUCCESS; }

1 0

Jacek Caban : winevulkan: Avoid unneeded copies in struct conversion functions.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: 121ca10f5d8bf9cfee58012b0a60c37e5d8e98d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/121ca10f5d8bf9cfee58012b0a60c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 6 18:48:11 2022 +0100 winevulkan: Avoid unneeded copies in struct conversion functions. --- dlls/winevulkan/make_vulkan | 65 ++++++++++++++++++++++++----------------- dlls/winevulkan/vulkan_thunks.c | 34 +++++---------------- 2 files changed, 45 insertions(+), 54 deletions(-)

1 0

Jacek Caban : winevulkan: Convert struct chains in struct conversion functions.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: e3999da6d781e8247d90b7575b1447c1bf156112 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3999da6d781e8247d90b7575b1447… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 6 14:49:25 2022 +0100 winevulkan: Convert struct chains in struct conversion functions. --- dlls/winevulkan/make_vulkan | 218 +- dlls/winevulkan/vulkan.c | 33 +- dlls/winevulkan/vulkan_thunks.c | 8792 ++++++++++++++++++++++----------------- dlls/winevulkan/vulkan_thunks.h | 4 - 4 files changed, 5105 insertions(+), 3942 deletions(-)

1 0

Jacek Caban : winevulkan: Move find_next_struct implementation to vulkan_private.h.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: 8bad123a6c3526ecffa0ae64a192d032ee48da36 URL: https://gitlab.winehq.org/wine/wine/-/commit/8bad123a6c3526ecffa0ae64a192d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 6 13:18:46 2022 +0100 winevulkan: Move find_next_struct implementation to vulkan_private.h. --- dlls/winevulkan/vulkan.c | 26 ++++++++------------------ dlls/winevulkan/vulkan_private.h | 13 +++++++++++++ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index aaebd9c26b8..ebbb526cea6 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -30,19 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); -#define wine_vk_find_struct(s, t) wine_vk_find_struct_((void *)s, VK_STRUCTURE_TYPE_##t) -static void *wine_vk_find_struct_(void *s, VkStructureType t) -{ - VkBaseOutStructure *header; - - for (header = s; header; header = header->pNext) - { - if (header->sType == t) - return header; - } - - return NULL; -} #define wine_vk_count_struct(s, t) wine_vk_count_struct_((void *)s, VK_STRUCTURE_TYPE_##t) static uint32_t wine_vk_count_struct_(void *s, VkStructureType t) @@ -471,7 +458,7 @@ static VkResult wine_vk_instance_convert_create_info(struct conversion_context * header = (VkBaseInStructure *) dst; for (i = 0; i < object->utils_messenger_count; i++) { - header = wine_vk_find_struct(header->pNext, DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT); + header = find_next_struct(header->pNext, VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT); debug_utils_messenger = (VkDebugUtilsMessengerCreateInfoEXT *) header; object->utils_messengers[i].instance = object; @@ -486,7 +473,8 @@ static VkResult wine_vk_instance_convert_create_info(struct conversion_context * debug_utils_messenger->pUserData = &object->utils_messengers[i]; } - debug_report_callback = wine_vk_find_struct(header->pNext, DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT); + debug_report_callback = find_next_struct(header->pNext, + VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT); if (debug_report_callback) { object->default_callback.instance = object; @@ -1207,7 +1195,8 @@ VkResult wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice phys_de res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2(phys_dev->phys_dev, format_info, properties); - if ((external_image_properties = wine_vk_find_struct(properties, EXTERNAL_IMAGE_FORMAT_PROPERTIES))) + if ((external_image_properties = find_next_struct(properties, + VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES))) { VkExternalMemoryProperties *p = &external_image_properties->externalMemoryProperties; p->externalMemoryFeatures = 0; @@ -1229,7 +1218,8 @@ VkResult wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice phys res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2KHR(phys_dev->phys_dev, format_info, properties); - if ((external_image_properties = wine_vk_find_struct(properties, EXTERNAL_IMAGE_FORMAT_PROPERTIES))) + if ((external_image_properties = find_next_struct(properties, + VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES))) { VkExternalMemoryProperties *p = &external_image_properties->externalMemoryProperties; p->externalMemoryFeatures = 0; @@ -1644,7 +1634,7 @@ static void fixup_pipeline_feedback_info(const void *pipeline_info) { VkPipelineCreationFeedbackCreateInfo *feedback; - feedback = wine_vk_find_struct(pipeline_info, PIPELINE_CREATION_FEEDBACK_CREATE_INFO); + feedback = find_next_struct(pipeline_info, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO); if (!feedback) return; diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 25890f00471..adc067462ce 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -276,4 +276,17 @@ static inline void *conversion_context_alloc(struct conversion_context *pool, si } } +static inline void *find_next_struct(const void *s, VkStructureType t) +{ + VkBaseOutStructure *header; + + for (header = (VkBaseOutStructure *)s; header; header = header->pNext) + { + if (header->sType == t) + return header; + } + + return NULL; +} + #endif /* __WINE_VULKAN_PRIVATE_H */

1 0

Gabriel Ivăncescu : mshtml: Implement document.importNode.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: 33c4904363ac95303ced6c0f2be56f4baf045674 URL: https://gitlab.winehq.org/wine/wine/-/commit/33c4904363ac95303ced6c0f2be56f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 7 17:35:13 2022 +0200 mshtml: Implement document.importNode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/mshtml/htmlnode.c | 5 +++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.js | 27 +++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index dd7d9f44d48..0988d34f85b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4375,8 +4375,41 @@ static HRESULT WINAPI HTMLDocument7_importNode(IHTMLDocument7 *iface, IHTMLDOMNo VARIANT_BOOL fDeep, IHTMLDOMNode3 **ppNodeDest) { HTMLDocumentNode *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p %x %p)\n", This, pNodeSource, fDeep, ppNodeDest); - return E_NOTIMPL; + nsIDOMNode *nsnode = NULL; + HTMLDOMNode *node; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p %x %p)\n", This, pNodeSource, fDeep, ppNodeDest); + + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + if(!(node = unsafe_impl_from_IHTMLDOMNode(pNodeSource))) { + ERR("not our node\n"); + return E_FAIL; + } + + nsres = nsIDOMHTMLDocument_ImportNode(This->nsdoc, node->nsnode, !!fDeep, 1, &nsnode); + if(NS_FAILED(nsres)) { + ERR("ImportNode failed: %08lx\n", nsres); + return map_nsresult(nsres); + } + + if(!nsnode) { + *ppNodeDest = NULL; + return S_OK; + } + + hres = get_node(nsnode, TRUE, &node); + nsIDOMNode_Release(nsnode); + if(FAILED(hres)) + return hres; + + *ppNodeDest = &node->IHTMLDOMNode3_iface; + return hres; } static HRESULT WINAPI HTMLDocument7_get_parentWindow(IHTMLDocument7 *iface, IHTMLWindow2 **p) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 42ac37a7736..a293b332a9f 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1067,6 +1067,11 @@ static const IHTMLDOMNodeVtbl HTMLDOMNodeVtbl = { HTMLDOMNode_get_nextSibling }; +HTMLDOMNode *unsafe_impl_from_IHTMLDOMNode(IHTMLDOMNode *iface) +{ + return iface->lpVtbl == &HTMLDOMNodeVtbl ? impl_from_IHTMLDOMNode(iface) : NULL; +} + static HTMLDOMNode *get_node_obj(IHTMLDOMNode *iface) { HTMLDOMNode *ret; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c403b4efc54..23eeb0ec11b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -807,6 +807,8 @@ struct HTMLDOMNode { HTMLDocumentNode *doc; }; +HTMLDOMNode *unsafe_impl_from_IHTMLDOMNode(IHTMLDOMNode*) DECLSPEC_HIDDEN; + static inline void node_addref(HTMLDOMNode *node) { IHTMLDOMNode_AddRef(&node->IHTMLDOMNode_iface); diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 43c52d89757..5a31b869c8f 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -722,3 +722,30 @@ sync_test("classList", function() { ok(("" + classList) === " testclass foobar ", "Expected classList value ' testclass foobar ', got " + classList); ok(classList.toString() === " testclass foobar ", "Expected classList toString ' testclass foobar ', got " + classList.toString()); }); + +sync_test("importNode", function() { + var node, node2, orig_node, doc = document.implementation.createHTMLDocument("TestDoc"); + doc.body.innerHTML = '<div id="test"><span/></div>'; + orig_node = doc.getElementById("test"); + + node = document.importNode(orig_node, false); + ok(node !== orig_node, "node = orig_node"); + ok(orig_node.hasChildNodes() === true, "orig_node does not have child nodes"); + ok(orig_node.parentNode === doc.body, "orig_node.parentNode = " + orig_node.parentNode); + ok(node.hasChildNodes() === false, "node has child nodes with shallow import"); + ok(node.parentNode === null, "node.parentNode = " + node.parentNode); + + node = document.importNode(orig_node, true); + ok(node !== orig_node, "node = orig_node"); + ok(orig_node.hasChildNodes() === true, "orig_node does not have child nodes"); + ok(orig_node.parentNode === doc.body, "orig_node.parentNode = " + orig_node.parentNode); + ok(node.hasChildNodes() === true, "node does not have child nodes with deep import"); + ok(node.parentNode === null, "node.parentNode = " + node.parentNode); + + node2 = document.importNode(node, false); + ok(node !== node2, "node = node2"); + ok(node.hasChildNodes() === true, "node does not have child nodes"); + ok(node.parentNode === null, "node.parentNode = " + node.parentNode); + ok(node2.hasChildNodes() === false, "node2 has child nodes"); + ok(node2.parentNode === null, "node2.parentNode = " + node2.parentNode); +});

1 0

Gabriel Ivăncescu : mshtml: Implement HTMLLocation_put_hash.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: c4e6f04400f1587cb58bfd3eb63c9747504a77a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4e6f04400f1587cb58bfd3eb63c97… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 7 17:35:13 2022 +0200 mshtml: Implement HTMLLocation_put_hash. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmllocation.c | 25 +++++++++++++++++++++++-- dlls/mshtml/tests/documentmode.js | 12 ++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 8f7800ff2a3..26365a7a5d0 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -524,8 +524,29 @@ static HRESULT WINAPI HTMLLocation_get_search(IHTMLLocation *iface, BSTR *p) static HRESULT WINAPI HTMLLocation_put_hash(IHTMLLocation *iface, BSTR v) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + WCHAR *hash = v; + HRESULT hres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->window || !This->window->base.outer_window) { + FIXME("No window available\n"); + return E_FAIL; + } + + if(hash[0] != '#') { + unsigned size = (1 /* # */ + wcslen(v) + 1) * sizeof(WCHAR); + if(!(hash = heap_alloc(size))) + return E_OUTOFMEMORY; + hash[0] = '#'; + memcpy(hash + 1, v, size - sizeof(WCHAR)); + } + + hres = navigate_url(This->window->base.outer_window, hash, This->window->base.outer_window->uri, BINDING_NAVIGATED); + + if(hash != v) + heap_free(hash); + return hres; } static HRESULT WINAPI HTMLLocation_get_hash(IHTMLLocation *iface, BSTR *p) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 92f30f8b7e9..5da89349d6d 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -895,6 +895,18 @@ async_test("script_load", function() { external.writeStream("simple", "ready_states += 'exec,';"); }); +sync_test("location", function() { + document.body.innerHTML = '<a name="testanchor">test</a>'; + + ok(location.hash === "", "initial location.hash = " + location.hash); + location.hash = "TestAnchor"; + ok(location.hash === "#TestAnchor", "location.hash after set to TestAnchor = " + location.hash); + location.hash = "##foo"; + ok(location.hash === "##foo", "location.hash after set to ##foo = " + location.hash); + location.hash = "#testanchor"; + ok(location.hash === "#testanchor", "location.hash after set to #testanchor = " + location.hash); +}); + sync_test("navigator", function() { var v = document.documentMode, re; var app = navigator.appVersion;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022