February 2021 - Wine-commits

Rémi Bernon : wmphoto: Implement class factory for WmpDecoder.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: 0027827290f4a411389e402eb2e1766d94e5e0c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0027827290f4a411389e402e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 10:53:27 2021 +0100 wmphoto: Implement class factory for WmpDecoder. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmphoto/Makefile.in | 10 +++- dlls/wmphoto/main.c | 128 +++++++++++++++++++++++++++++++++++++++++++---- dlls/wmphoto/unix_lib.c | 108 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 235 insertions(+), 11 deletions(-) diff --git a/dlls/wmphoto/Makefile.in b/dlls/wmphoto/Makefile.in index 24e1f49496a..8a626e61f18 100644 --- a/dlls/wmphoto/Makefile.in +++ b/dlls/wmphoto/Makefile.in @@ -1,7 +1,15 @@ MODULE = wmphoto.dll +IMPORTS = windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi +PARENTSRC = ../windowscodecs EXTRADLLFLAGS = -mno-cygwin +EXTRAINCL = $(JXRLIB_CFLAGS) -C_SRCS = main.c +C_SRCS = \ + decoder.c \ + main.c \ + unix_iface.c \ + unix_lib.c \ + wincodecs_common.c IDL_SRCS = wmphoto.idl diff --git a/dlls/wmphoto/main.c b/dlls/wmphoto/main.c index d3a926e7704..7659dcb2ca8 100644 --- a/dlls/wmphoto/main.c +++ b/dlls/wmphoto/main.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Vincent Povirk for CodeWeavers + * Copyright 2020 Rémi Bernon for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,24 +19,121 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "objbase.h" #include "rpcproxy.h" +#include "wincodecs_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); -static HINSTANCE WMPHOTO_hInstance; +HRESULT create_instance(const CLSID *clsid, const IID *iid, void **ppv) +{ + return CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, iid, ppv); +} + +HRESULT get_decoder_info(REFCLSID clsid, IWICBitmapDecoderInfo **info) +{ + IWICImagingFactory* factory; + IWICComponentInfo *compinfo; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + if (FAILED(hr)) + return hr; + + hr = IWICImagingFactory_CreateComponentInfo(factory, clsid, &compinfo); + if (FAILED(hr)) + { + IWICImagingFactory_Release(factory); + return hr; + } + + hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, + (void **)info); + + IWICComponentInfo_Release(compinfo); + IWICImagingFactory_Release(factory); + return hr; +} + +struct class_factory +{ + IClassFactory IClassFactory_iface; +}; + +static HRESULT WINAPI wmp_class_factory_QueryInterface(IClassFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IClassFactory)) + { + *out = iface; + IClassFactory_AddRef(iface); + return S_OK; + } + + *out = NULL; + FIXME("%s not implemented.\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI wmp_class_factory_AddRef(IClassFactory *iface) { return 2; } -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +static ULONG WINAPI wmp_class_factory_Release(IClassFactory *iface) { return 1; } + +static HRESULT WINAPI wmp_class_factory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID iid, void **out) +{ + struct decoder_info decoder_info; + struct decoder *decoder; + HRESULT hr; + + TRACE("iface %p, outer %p, iid %s, out %p.\n", iface, outer, debugstr_guid(iid), out); + + *out = NULL; + if (outer) return CLASS_E_NOAGGREGATION; + + hr = get_unix_decoder(&CLSID_WICWmpDecoder, &decoder_info, &decoder); + + if (SUCCEEDED(hr)) + hr = CommonDecoder_CreateInstance(decoder, &decoder_info, iid, out); + + return hr; +} + +static HRESULT WINAPI wmp_class_factory_LockServer(IClassFactory *iface, BOOL lock) +{ + FIXME("iface %p, lock %d, stub!\n", iface, lock); + return S_OK; +} + +static const IClassFactoryVtbl wmp_class_factory_vtbl = +{ + wmp_class_factory_QueryInterface, + wmp_class_factory_AddRef, + wmp_class_factory_Release, + wmp_class_factory_CreateInstance, + wmp_class_factory_LockServer, +}; + +static struct class_factory wmp_class_factory = {{&wmp_class_factory_vtbl}}; + +HMODULE windowscodecs_module = 0; + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - switch (fdwReason) + TRACE("instance %p, reason %d, reserved %p\n", instance, reason, reserved); + + switch (reason) { case DLL_PROCESS_ATTACH: - WMPHOTO_hInstance = hinstDLL; - DisableThreadLibraryCalls(hinstDLL); + windowscodecs_module = instance; + DisableThreadLibraryCalls(instance); break; case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ @@ -49,18 +147,28 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *out) { - FIXME("wmphoto: stub\n"); - return E_NOTIMPL; + struct class_factory *factory; + + TRACE("clsid %s, iid %s, out %p.\n", debugstr_guid(clsid), debugstr_guid(iid), out); + + if (IsEqualGUID(clsid, &CLSID_WICWmpDecoder)) factory = &wmp_class_factory; + else + { + FIXME("%s not implemented.\n", debugstr_guid(clsid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + + return IClassFactory_QueryInterface(&factory->IClassFactory_iface, iid, out); } HRESULT WINAPI DllRegisterServer(void) { - return __wine_register_resources( WMPHOTO_hInstance ); + return __wine_register_resources( windowscodecs_module ); } HRESULT WINAPI DllUnregisterServer(void) { - return __wine_unregister_resources( WMPHOTO_hInstance ); + return __wine_unregister_resources( windowscodecs_module ); } diff --git a/dlls/wmphoto/unix_lib.c b/dlls/wmphoto/unix_lib.c new file mode 100644 index 00000000000..198c93969f8 --- /dev/null +++ b/dlls/wmphoto/unix_lib.c @@ -0,0 +1,108 @@ +/* + * unix_lib.c - This is the Unix side of the Unix interface. + * + * Copyright 2020 Esme Povirk + * + * 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 + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#define NONAMELESSUNION + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "winbase.h" +#include "objbase.h" + +#include "initguid.h" +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +#include "wincodecs_common.h" + +static const struct win32_funcs *win32_funcs; + +HRESULT CDECL stream_getsize(IStream *stream, ULONGLONG *size) +{ + return win32_funcs->stream_getsize(stream, size); +} + +HRESULT CDECL stream_read(IStream *stream, void *buffer, ULONG read, ULONG *bytes_read) +{ + return win32_funcs->stream_read(stream, buffer, read, bytes_read); +} + +HRESULT CDECL stream_seek(IStream *stream, LONGLONG ofs, DWORD origin, ULONGLONG *new_position) +{ + return win32_funcs->stream_seek(stream, ofs, origin, new_position); +} + +HRESULT CDECL stream_write(IStream *stream, const void *buffer, ULONG write, ULONG *bytes_written) +{ + return win32_funcs->stream_write(stream, buffer, write, bytes_written); +} + +HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result) +{ + FIXME("decoder_clsid %s, info %p, result %p, stub!\n", debugstr_guid(decoder_clsid), info, result); + return E_NOTIMPL; +} + +HRESULT CDECL encoder_create(const CLSID *encoder_clsid, struct encoder_info *info, struct encoder **result) +{ + FIXME("encoder_clsid %s, info %p, result %p, stub!\n", debugstr_guid(encoder_clsid), info, result); + return E_NOTIMPL; +} + +static const struct unix_funcs unix_funcs = { + decoder_create, + decoder_initialize, + decoder_get_frame_info, + decoder_copy_pixels, + decoder_get_metadata_blocks, + decoder_get_color_context, + decoder_destroy, + encoder_create, + encoder_initialize, + encoder_get_supported_format, + encoder_create_frame, + encoder_write_lines, + encoder_commit_frame, + encoder_commit_file, + encoder_destroy +}; + +NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) +{ + if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; + + win32_funcs = ptr_in; + + *(const struct unix_funcs **)ptr_out = &unix_funcs; + return STATUS_SUCCESS; +}

1 0

Zebediah Figura : winegstreamer: Move the stream event fields to struct wg_parser_stream.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: 763806843b1219e28658ed9de8373aff4c5d6849 URL: https://source.winehq.org/git/wine.git/?a=commit;h=763806843b1219e28658ed9d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 3 17:41:38 2021 -0600 winegstreamer: Move the stream event fields to struct wg_parser_stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 125 +++++++++++++++++++++--------------------- 1 file changed, 64 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=763806843b1219e28658…

1 0

Zebediah Figura : winegstreamer: Move the "eos" field to struct wg_parser_stream.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: c7117240748d4ad79a6b5cf19f2d326c1f37fb5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7117240748d4ad79a6b5cf1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 3 17:41:39 2021 -0600 winegstreamer: Move the "eos" field to struct wg_parser_stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index eaad0f56133..6aadeb29175 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -105,6 +105,8 @@ struct wg_parser_stream pthread_cond_t event_cond, event_empty_cond; struct wg_parser_event event; + + bool eos; }; struct parser @@ -147,7 +149,7 @@ struct parser_source SourceSeeking seek; CRITICAL_SECTION flushing_cs; - bool flushing, eos; + bool flushing; HANDLE thread; }; @@ -784,7 +786,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) else { pthread_mutex_lock(&parser->mutex); - pin->eos = true; + stream->eos = true; pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); } @@ -2927,7 +2929,7 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) } pthread_mutex_lock(&parser->mutex); - while (!parser->has_duration && !parser->error && !pin->eos) + while (!parser->has_duration && !parser->error && !stream->eos) pthread_cond_wait(&parser->init_cond, &parser->mutex); if (parser->error) {

1 0

Zebediah Figura : winegstreamer: Move the "flushing" field to struct wg_parser_stream.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: cb7fb161471f495f2d678f793a9f59f87291f9a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb7fb161471f495f2d678f79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 3 17:41:40 2021 -0600 winegstreamer: Move the "flushing" field to struct wg_parser_stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6aadeb29175..1332810e4ea 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -106,7 +106,7 @@ struct wg_parser_stream pthread_cond_t event_cond, event_empty_cond; struct wg_parser_event event; - bool eos; + bool flushing, eos; }; struct parser @@ -149,7 +149,6 @@ struct parser_source SourceSeeking seek; CRITICAL_SECTION flushing_cs; - bool flushing; HANDLE thread; }; @@ -725,9 +724,9 @@ static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct * is solved by flushing the upstream source. */ pthread_mutex_lock(&parser->mutex); - while (!pin->flushing && stream->event.type != WG_PARSER_EVENT_NONE) + while (!stream->flushing && stream->event.type != WG_PARSER_EVENT_NONE) pthread_cond_wait(&stream->event_empty_cond, &parser->mutex); - if (pin->flushing) + if (stream->flushing) { pthread_mutex_unlock(&parser->mutex); GST_DEBUG("Filter is flushing; discarding event."); @@ -797,7 +796,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) { pthread_mutex_lock(&parser->mutex); - pin->flushing = true; + stream->flushing = true; pthread_cond_signal(&stream->event_empty_cond); switch (stream->event.type) @@ -822,7 +821,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) if (pin->pin.pin.peer) { pthread_mutex_lock(&parser->mutex); - pin->flushing = false; + stream->flushing = false; pthread_mutex_unlock(&parser->mutex); } break; @@ -2555,7 +2554,7 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) pthread_mutex_lock(&parser->mutex); for (i = 0; i < This->source_count; ++i) { - This->sources[i]->flushing = true; + This->sources[i]->wg_stream->flushing = true; pthread_cond_signal(&This->sources[i]->wg_stream->event_empty_cond); } pthread_mutex_unlock(&parser->mutex);

1 0

Zebediah Figura : winegstreamer: Avoid accessing the DirectShow peer from GStreamer callbacks.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: 87daa41eb3c5b5891846d54f8d390ac817be21be URL: https://source.winehq.org/git/wine.git/?a=commit;h=87daa41eb3c5b5891846d54f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 3 17:41:41 2021 -0600 winegstreamer: Avoid accessing the DirectShow peer from GStreamer callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1332810e4ea..e47b4a30388 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -106,7 +106,7 @@ struct wg_parser_stream pthread_cond_t event_cond, event_empty_cond; struct wg_parser_event event; - bool flushing, eos; + bool flushing, eos, enabled; }; struct parser @@ -546,6 +546,7 @@ static GstCaps *amt_to_gst_caps(const AM_MEDIA_TYPE *mt) static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) { struct parser_source *pin = gst_pad_get_element_private(pad); + struct wg_parser_stream *stream = pin->wg_stream; TRACE("pin %p, type \"%s\".\n", pin, gst_query_type_get_name(query->type)); @@ -557,7 +558,7 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_caps(query, &filter); - if (pin->pin.pin.peer) + if (stream->enabled) caps = amt_to_gst_caps(&pin->pin.pin.mt); else caps = gst_caps_new_any(); @@ -581,7 +582,7 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) AM_MEDIA_TYPE mt; GstCaps *caps; - if (!pin->pin.pin.peer) + if (!stream->enabled) { gst_query_set_accept_caps_result(query, TRUE); return TRUE; @@ -751,7 +752,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) switch (event->type) { case GST_EVENT_SEGMENT: - if (pin->pin.pin.peer) + if (stream->enabled) { struct wg_parser_event stream_event; const GstSegment *segment; @@ -775,7 +776,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) break; case GST_EVENT_EOS: - if (pin->pin.pin.peer) + if (stream->enabled) { struct wg_parser_event stream_event; @@ -792,7 +793,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) break; case GST_EVENT_FLUSH_START: - if (pin->pin.pin.peer) + if (stream->enabled) { pthread_mutex_lock(&parser->mutex); @@ -818,7 +819,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) case GST_EVENT_FLUSH_STOP: gst_segment_init(stream->segment, GST_FORMAT_TIME); - if (pin->pin.pin.peer) + if (stream->enabled) { pthread_mutex_lock(&parser->mutex); stream->flushing = false; @@ -900,12 +901,13 @@ static void *push_data(void *iface) static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *buffer) { struct parser_source *pin = gst_pad_get_element_private(pad); + struct wg_parser_stream *stream = pin->wg_stream; struct wg_parser_event stream_event; GstFlowReturn ret; GST_LOG("pin %p, buffer %p.", pin, buffer); - if (!pin->pin.pin.peer) + if (!stream->enabled) { gst_buffer_unref(buffer); return GST_FLOW_OK; @@ -2434,6 +2436,8 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, buffer_size = format->nAvgBytesPerSec; } + stream->enabled = true; + gst_pad_push_event(stream->my_sink, gst_event_new_reconfigure()); /* We do need to drop any buffers that might have been sent with the old * caps, but this will be handled in parser_init_stream(). */ @@ -2444,6 +2448,14 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, return IMemAllocator_SetProperties(allocator, props, &ret_props); } +static void source_disconnect(struct strmbase_source *iface) +{ + struct parser_source *pin = impl_source_from_IPin(&iface->pin.IPin_iface); + struct wg_parser_stream *stream = pin->wg_stream; + + stream->enabled = false; +} + static void free_source_pin(struct parser_source *pin) { struct wg_parser_stream *stream = pin->wg_stream; @@ -2493,6 +2505,7 @@ static const struct strmbase_source_ops source_ops = .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, .pfnDecideBufferSize = GSTOutPin_DecideBufferSize, + .source_disconnect = source_disconnect, }; static struct parser_source *create_pin(struct parser *filter, const WCHAR *name)

1 0

Zebediah Figura : winegstreamer: Reset the push offset in parser_init_stream().
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: c0b087e4e998ed860bfbc02315ab7b750b156f28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0b087e4e998ed860bfbc023… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 3 17:41:42 2021 -0600 winegstreamer: Reset the push offset in parser_init_stream(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e47b4a30388..45bd2f9a4a9 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1464,8 +1464,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) pthread_join(parser->push_thread, NULL); parser->push_thread = 0; } - if (This->filter.state == State_Stopped) - parser->next_offset = parser->start_offset; } else if (!parser->push_thread) { int ret; @@ -1746,6 +1744,8 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) /* DirectShow retains the old seek positions, but resets to them every time * it transitions from stopped -> paused. */ + parser->next_offset = parser->start_offset; + seeking = &filter->sources[0]->seek; if (seeking->llStop && seeking->llStop != seeking->llDuration) stop_type = GST_SEEK_TYPE_SET;

1 0

Michael Müller : kernel32: Add sr-Latn-RS locale definition.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: db2666e9d20f80968ff6b4b0ea1deae20c3c368b URL: https://source.winehq.org/git/wine.git/?a=commit;h=db2666e9d20f80968ff6b4b0… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 3 17:48:33 2021 -0600 kernel32: Add sr-Latn-RS locale definition. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale_rc.rc | 1 + dlls/kernel32/nls/srm.nls | 174 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index c6bb407b1c5..86ababd0900 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -143,6 +143,7 @@ #include "nls/hrv.nls" /* 0x041a LANG_SERBIAN, SUBLANG_DEFAULT */ #include "nls/srl.nls" /* 0x081a LANG_SERBIAN, SUBLANG_SERBIAN_LATIN */ #include "nls/srb.nls" /* 0x0c1a LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC */ +#include "nls/srm.nls" /* 0x241a LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN */ #include "nls/sky.nls" /* 0x041b LANG_SLOVAK, SUBLANG_DEFAULT */ diff --git a/dlls/kernel32/nls/srm.nls b/dlls/kernel32/nls/srm.nls new file mode 100644 index 00000000000..f4b1169943a --- /dev/null +++ b/dlls/kernel32/nls/srm.nls @@ -0,0 +1,174 @@ +/* + * Locale definitions for Serbian (Serbia, Latin) + * + * Copyright 2016 Michael Müller + * + * 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 + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN +{ + LOCALE_FONTSIGNATURE L"\x0027\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0002\x0000\x0000\x0400\x0012\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "381" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "0" + LOCALE_IDEFAULTANSICODEPAGE "1250" + LOCALE_IDEFAULTCODEPAGE "852" + LOCALE_IDEFAULTCOUNTRY "381" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "241a" + LOCALE_IDEFAULTMACCODEPAGE "10029" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "271" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "241a" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "0" + LOCALE_INEGATIVEPERCENT "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_INEUTRAL "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "pre podne" + LOCALE_S2359 "po podne" + LOCALE_SABBREVCTRYNAME "SRB" + LOCALE_SABBREVDAYNAME1 "pon" + LOCALE_SABBREVDAYNAME2 "uto" + LOCALE_SABBREVDAYNAME3 "sre" + LOCALE_SABBREVDAYNAME4 "čet" + LOCALE_SABBREVDAYNAME5 "pet" + LOCALE_SABBREVDAYNAME6 "sub" + LOCALE_SABBREVDAYNAME7 "ned" + LOCALE_SABBREVLANGNAME "SRM" + LOCALE_SABBREVMONTHNAME1 "jan" + LOCALE_SABBREVMONTHNAME2 "feb" + LOCALE_SABBREVMONTHNAME3 "mar" + LOCALE_SABBREVMONTHNAME4 "apr" + LOCALE_SABBREVMONTHNAME5 "maj" + LOCALE_SABBREVMONTHNAME6 "jun" + LOCALE_SABBREVMONTHNAME7 "jul" + LOCALE_SABBREVMONTHNAME8 "avg" + LOCALE_SABBREVMONTHNAME9 "sep" + LOCALE_SABBREVMONTHNAME10 "okt" + LOCALE_SABBREVMONTHNAME11 "nov" + LOCALE_SABBREVMONTHNAME12 "dec" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Serbia" + LOCALE_SCURRENCY "Din." + LOCALE_SDATE "." + LOCALE_SDAYNAME1 "ponedeljak" + LOCALE_SDAYNAME2 "utorak" + LOCALE_SDAYNAME3 "sreda" + LOCALE_SDAYNAME4 "četvrtak" + LOCALE_SDAYNAME5 "petak" + LOCALE_SDAYNAME6 "subota" + LOCALE_SDAYNAME7 "nedelja" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Serbia" + LOCALE_SENGCURRNAME "Serbian Dinar" + LOCALE_SENGLANGUAGE "Serbian (Latin)" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "RSD" + LOCALE_SISO3166CTRYNAME "RS" + LOCALE_SISO639LANGNAME "sr" + LOCALE_SLANGUAGE "Serbian (Latin, Serbia)" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd, dd. MMMM yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" + LOCALE_SMONTHNAME1 "januar" + LOCALE_SMONTHNAME2 "februar" + LOCALE_SMONTHNAME3 "mart" + LOCALE_SMONTHNAME4 "april" + LOCALE_SMONTHNAME5 "maj" + LOCALE_SMONTHNAME6 "jun" + LOCALE_SMONTHNAME7 "jul" + LOCALE_SMONTHNAME8 "avgust" + LOCALE_SMONTHNAME9 "septembar" + LOCALE_SMONTHNAME10 "oktobar" + LOCALE_SMONTHNAME11 "novembar" + LOCALE_SMONTHNAME12 "decembar" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "." + LOCALE_SNAME "sr-Latn-RS" + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "Srbija" + LOCALE_SNATIVECURRNAME "Srpski dinar" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "srpski (Srbija)" + LOCALE_SNATIVELANGNAME "srpski" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "SRB " + LOCALE_SPARENT "sr-Latn" + LOCALE_SPOSINFINITY L"\x221e" + LOCALE_SPOSITIVESIGN "+" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SSHORTDATE "d.M.yyyy" + LOCALE_SSHORTESTDAYNAME1 "pon" + LOCALE_SSHORTESTDAYNAME2 "uto" + LOCALE_SSHORTESTDAYNAME3 "sre" + LOCALE_SSHORTESTDAYNAME4 "čet" + LOCALE_SSHORTESTDAYNAME5 "pet" + LOCALE_SSHORTESTDAYNAME6 "sub" + LOCALE_SSHORTESTDAYNAME7 "ned" + LOCALE_SSHORTTIME "H:mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "." + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "H:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +}

1 0

Zebediah Figura : vkd3d-shader: Move hlsl_message() and hlsl_report_message() to hlsl.c.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: vkd3d Branch: master Commit: 0da1401d3db2afbef4308fd7c17043dbb47c368c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0da1401d3db2afbef4308fd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 2 16:11:13 2021 -0600 vkd3d-shader: Move hlsl_message() and hlsl_report_message() to hlsl.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 16 ++++++++++++++++ libs/vkd3d-shader/hlsl.y | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ebd74e6..011cdaf 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -20,6 +20,22 @@ #include "hlsl.h" #include <stdio.h> +void hlsl_message(const char *fmt, ...) +{ + /* FIXME */ +} + +void hlsl_report_message(const struct source_location loc, + enum hlsl_error_level level, const char *fmt, ...) +{ + /* FIXME */ + + if (level == HLSL_LEVEL_ERROR) + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + else if (level == HLSL_LEVEL_WARNING) + set_parse_status(&hlsl_ctx.status, PARSE_WARN); +} + BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) { struct hlsl_ir_var *var; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ed83207..e1ba7c9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -30,22 +30,6 @@ struct hlsl_parse_ctx hlsl_ctx; struct YYLTYPE; static struct source_location get_location(const struct YYLTYPE *l); -void hlsl_message(const char *fmt, ...) -{ - /* FIXME */ -} - -void hlsl_report_message(const struct source_location loc, - enum hlsl_error_level level, const char *fmt, ...) -{ - /* FIXME */ - - if (level == HLSL_LEVEL_ERROR) - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - else if (level == HLSL_LEVEL_WARNING) - set_parse_status(&hlsl_ctx.status, PARSE_WARN); -} - static void hlsl_error(const char *s) { const struct source_location loc =

1 0

Zebediah Figura : vkd3d-shader: Add a hlsl_ namespace prefix to common functions.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: vkd3d Branch: master Commit: 7c5bd7c776cac57c93367593710ef6a6f1eb4fb0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7c5bd7c776cac57c9336759… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 2 16:11:14 2021 -0600 vkd3d-shader: Add a hlsl_ namespace prefix to common functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 168 +++++++++++++-------------- libs/vkd3d-shader/hlsl.h | 132 +++++++++++---------- libs/vkd3d-shader/hlsl.l | 5 +- libs/vkd3d-shader/hlsl.y | 292 +++++++++++++++++++++++------------------------ 4 files changed, 303 insertions(+), 294 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=7c5bd7c776cac57c933…

1 0

Zebediah Figura : vkd3d-shader: Rename debug_dump_*() to dump_*().
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: vkd3d Branch: master Commit: db1765c283be92e795e6dc3552c3b21b8cb5d830 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=db1765c283be92e795e6dc3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 2 16:11:15 2021 -0600 vkd3d-shader: Rename debug_dump_*() to dump_*(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 67 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 20b4fa7..ddc690e 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -748,20 +748,20 @@ const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) return names[type]; } -static void debug_dump_instr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_node *instr); +static void dump_instr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_node *instr); -static void debug_dump_instr_list(struct vkd3d_string_buffer *buffer, const struct list *list) +static void dump_instr_list(struct vkd3d_string_buffer *buffer, const struct list *list) { struct hlsl_ir_node *instr; LIST_FOR_EACH_ENTRY(instr, list, struct hlsl_ir_node, entry) { - debug_dump_instr(buffer, instr); + dump_instr(buffer, instr); vkd3d_string_buffer_printf(buffer, "\n"); } } -static void debug_dump_src(struct vkd3d_string_buffer *buffer, const struct hlsl_src *src) +static void dump_src(struct vkd3d_string_buffer *buffer, const struct hlsl_src *src) { if (src->node->index) vkd3d_string_buffer_printf(buffer, "@%u", src->node->index); @@ -769,7 +769,7 @@ static void debug_dump_src(struct vkd3d_string_buffer *buffer, const struct hlsl vkd3d_string_buffer_printf(buffer, "%p", src->node); } -static void debug_dump_ir_var(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_var *var) +static void dump_ir_var(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_var *var) { if (var->modifiers) vkd3d_string_buffer_printf(buffer, "%s ", hlsl_debug_modifiers(var->modifiers)); @@ -778,7 +778,7 @@ static void debug_dump_ir_var(struct vkd3d_string_buffer *buffer, const struct h vkd3d_string_buffer_printf(buffer, " : %s", var->semantic); } -static void debug_dump_deref(struct vkd3d_string_buffer *buffer, const struct hlsl_deref *deref) +static void dump_deref(struct vkd3d_string_buffer *buffer, const struct hlsl_deref *deref) { if (deref->offset.node) /* Print the variable's type for convenience. */ @@ -788,7 +788,7 @@ static void debug_dump_deref(struct vkd3d_string_buffer *buffer, const struct hl if (deref->offset.node) { vkd3d_string_buffer_printf(buffer, "["); - debug_dump_src(buffer, &deref->offset); + dump_src(buffer, &deref->offset); vkd3d_string_buffer_printf(buffer, "]"); } } @@ -812,18 +812,18 @@ static const char *debug_writemask(DWORD writemask) return vkd3d_dbg_sprintf(".%s", string); } -static void debug_dump_ir_assignment(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_assignment *assign) +static void dump_ir_assignment(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_assignment *assign) { vkd3d_string_buffer_printf(buffer, "= ("); - debug_dump_deref(buffer, &assign->lhs); + dump_deref(buffer, &assign->lhs); if (assign->writemask != VKD3DSP_WRITEMASK_ALL) vkd3d_string_buffer_printf(buffer, "%s", debug_writemask(assign->writemask)); vkd3d_string_buffer_printf(buffer, " "); - debug_dump_src(buffer, &assign->rhs); + dump_src(buffer, &assign->rhs); vkd3d_string_buffer_printf(buffer, ")"); } -static void debug_dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_constant *constant) +static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_constant *constant) { struct hlsl_type *type = constant->node.data_type; unsigned int x; @@ -939,32 +939,31 @@ static const char *debug_expr_op(const struct hlsl_ir_expr *expr) return op_names[expr->op]; } -/* Dumps the expression in a prefix "operator (operands)" form */ -static void debug_dump_ir_expr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_expr *expr) +static void dump_ir_expr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_expr *expr) { unsigned int i; vkd3d_string_buffer_printf(buffer, "%s (", debug_expr_op(expr)); for (i = 0; i < 3 && expr->operands[i].node; ++i) { - debug_dump_src(buffer, &expr->operands[i]); + dump_src(buffer, &expr->operands[i]); vkd3d_string_buffer_printf(buffer, " "); } vkd3d_string_buffer_printf(buffer, ")"); } -static void debug_dump_ir_if(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_if *if_node) +static void dump_ir_if(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_if *if_node) { vkd3d_string_buffer_printf(buffer, "if ("); - debug_dump_src(buffer, &if_node->condition); + dump_src(buffer, &if_node->condition); vkd3d_string_buffer_printf(buffer, ")\n{\n"); - debug_dump_instr_list(buffer, &if_node->then_instrs); + dump_instr_list(buffer, &if_node->then_instrs); vkd3d_string_buffer_printf(buffer, "}\nelse\n{\n"); - debug_dump_instr_list(buffer, &if_node->else_instrs); + dump_instr_list(buffer, &if_node->else_instrs); vkd3d_string_buffer_printf(buffer, "}\n"); } -static void debug_dump_ir_jump(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_jump *jump) +static void dump_ir_jump(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_jump *jump) { switch (jump->type) { @@ -986,18 +985,18 @@ static void debug_dump_ir_jump(struct vkd3d_string_buffer *buffer, const struct } } -static void debug_dump_ir_loop(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_loop *loop) +static void dump_ir_loop(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_loop *loop) { vkd3d_string_buffer_printf(buffer, "for (;;)\n{\n"); - debug_dump_instr_list(buffer, &loop->body); + dump_instr_list(buffer, &loop->body); vkd3d_string_buffer_printf(buffer, "}\n"); } -static void debug_dump_ir_swizzle(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_swizzle *swizzle) +static void dump_ir_swizzle(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_swizzle *swizzle) { unsigned int i; - debug_dump_src(buffer, &swizzle->val); + dump_src(buffer, &swizzle->val); vkd3d_string_buffer_printf(buffer, "."); if (swizzle->val.node->data_type->dimy > 1) { @@ -1013,7 +1012,7 @@ static void debug_dump_ir_swizzle(struct vkd3d_string_buffer *buffer, const stru } } -static void debug_dump_instr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_node *instr) +static void dump_instr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_node *instr) { if (instr->index) vkd3d_string_buffer_printf(buffer, "%4u: ", instr->index); @@ -1025,35 +1024,35 @@ static void debug_dump_instr(struct vkd3d_string_buffer *buffer, const struct hl switch (instr->type) { case HLSL_IR_ASSIGNMENT: - debug_dump_ir_assignment(buffer, hlsl_ir_assignment(instr)); + dump_ir_assignment(buffer, hlsl_ir_assignment(instr)); break; case HLSL_IR_CONSTANT: - debug_dump_ir_constant(buffer, hlsl_ir_constant(instr)); + dump_ir_constant(buffer, hlsl_ir_constant(instr)); break; case HLSL_IR_EXPR: - debug_dump_ir_expr(buffer, hlsl_ir_expr(instr)); + dump_ir_expr(buffer, hlsl_ir_expr(instr)); break; case HLSL_IR_IF: - debug_dump_ir_if(buffer, hlsl_ir_if(instr)); + dump_ir_if(buffer, hlsl_ir_if(instr)); break; case HLSL_IR_JUMP: - debug_dump_ir_jump(buffer, hlsl_ir_jump(instr)); + dump_ir_jump(buffer, hlsl_ir_jump(instr)); break; case HLSL_IR_LOAD: - debug_dump_deref(buffer, &hlsl_ir_load(instr)->src); + dump_deref(buffer, &hlsl_ir_load(instr)->src); break; case HLSL_IR_LOOP: - debug_dump_ir_loop(buffer, hlsl_ir_loop(instr)); + dump_ir_loop(buffer, hlsl_ir_loop(instr)); break; case HLSL_IR_SWIZZLE: - debug_dump_ir_swizzle(buffer, hlsl_ir_swizzle(instr)); + dump_ir_swizzle(buffer, hlsl_ir_swizzle(instr)); break; default: @@ -1071,13 +1070,13 @@ void hlsl_dump_function(const struct hlsl_ir_function_decl *func) vkd3d_string_buffer_printf(&buffer, "Function parameters:\n"); LIST_FOR_EACH_ENTRY(param, func->parameters, struct hlsl_ir_var, param_entry) { - debug_dump_ir_var(&buffer, param); + dump_ir_var(&buffer, param); vkd3d_string_buffer_printf(&buffer, "\n"); } if (func->semantic) vkd3d_string_buffer_printf(&buffer, "Function semantic: %s\n", func->semantic); if (func->body) - debug_dump_instr_list(&buffer, func->body); + dump_instr_list(&buffer, func->body); vkd3d_string_buffer_trace(&buffer); vkd3d_string_buffer_cleanup(&buffer);

1 0