- Wine-Devel - list.winehq.org

[PATCH] xmllite: Fix long types warnings.
by Nikolay Sivov Feb. 1, 2022

Feb. 1, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/Makefile.in | 1 - dlls/xmllite/reader.c | 24 ++++++++++---------- dlls/xmllite/writer.c | 48 +++++++++++++++++++++------------------- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/dlls/xmllite/Makefile.in b/dlls/xmllite/Makefile.in index 003c36a3a37..aeb448162f6 100644 --- a/dlls/xmllite/Makefile.in +++ b/dlls/xmllite/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xmllite.dll IMPORTLIB = xmllite diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 834c36ae18c..ccdc1ae2c1b 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -840,7 +840,7 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) read = 0; hr = ISequentialStream_Read(readerinput->stream, buffer->data + buffer->written, len, &read); - TRACE("written=%d, alloc=%d, requested=%d, read=%d, ret=0x%08x\n", buffer->written, buffer->allocated, len, read, hr); + TRACE("written=%d, alloc=%d, requested=%ld, read=%ld, ret=%#lx\n", buffer->written, buffer->allocated, len, read, hr); readerinput->pending = hr == E_PENDING; if (FAILED(hr)) return hr; buffer->written += read; @@ -2579,7 +2579,7 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) /* try to detect encoding by BOM or data and set input code page */ hr = readerinput_detectencoding(reader->input, &enc); - TRACE("detected encoding %s, 0x%08x\n", enc == XmlEncoding_Unknown ? "(unknown)" : + TRACE("detected encoding %s, %#lx.\n", enc == XmlEncoding_Unknown ? "(unknown)" : debugstr_w(xml_encoding_map[enc].name), hr); if (FAILED(hr)) return hr; @@ -2679,9 +2679,9 @@ static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, v static ULONG WINAPI xmlreader_AddRef(IXmlReader *iface) { - xmlreader *This = impl_from_IXmlReader(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + xmlreader *reader = impl_from_IXmlReader(iface); + ULONG ref = InterlockedIncrement(&reader->ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -2725,7 +2725,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) xmlreader *This = impl_from_IXmlReader(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (ref == 0) { @@ -2841,7 +2841,7 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%s 0x%lx)\n", This, debugstr_reader_prop(property), value); + TRACE("%p, %s, %Ix.\n", iface, debugstr_reader_prop(property), value); switch (property) { @@ -3590,9 +3590,9 @@ static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFI static ULONG WINAPI xmlreaderinput_AddRef(IXmlReaderInput *iface) { - xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + xmlreaderinput *input = impl_from_IXmlReaderInput(iface); + ULONG ref = InterlockedIncrement(&input->ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -3601,7 +3601,7 @@ static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) xmlreaderinput *This = impl_from_IXmlReaderInput(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (ref == 0) { @@ -3662,7 +3662,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) hr = IXmlReader_QueryInterface(&reader->IXmlReader_iface, riid, obj); IXmlReader_Release(&reader->IXmlReader_iface); - TRACE("returning iface %p, hr %#x\n", *obj, hr); + TRACE("returning iface %p, hr %#lx.\n", *obj, hr); return hr; } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index e4553ccf01d..ac02bd4c200 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -549,7 +549,7 @@ static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) written = 0; hr = ISequentialStream_Write(output->stream, buffer->data + offset, buffer->written, &written); if (FAILED(hr)) { - WARN("write to stream failed (0x%08x)\n", hr); + WARN("write to stream failed %#lx.\n", hr); buffer->written = 0; return hr; } @@ -700,28 +700,30 @@ static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, v static ULONG WINAPI xmlwriter_AddRef(IXmlWriter *iface) { - xmlwriter *This = impl_from_IXmlWriter(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + xmlwriter *writer = impl_from_IXmlWriter(iface); + ULONG ref = InterlockedIncrement(&writer->ref); + TRACE("%p, refcount %lu.\n", iface, ref); return ref; } static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) { - xmlwriter *This = impl_from_IXmlWriter(iface); - ULONG ref = InterlockedDecrement(&This->ref); + xmlwriter *writer = impl_from_IXmlWriter(iface); + ULONG ref = InterlockedDecrement(&writer->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); - if (ref == 0) { - IMalloc *imalloc = This->imalloc; + if (!ref) + { + IMalloc *imalloc = writer->imalloc; - writeroutput_flush_stream(This->output); - if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); + writeroutput_flush_stream(writer->output); + if (writer->output) + IUnknown_Release(&writer->output->IXmlWriterOutput_iface); - writer_free_element_stack(This); + writer_free_element_stack(writer); - writer_free(This, This); + writer_free(writer, writer); if (imalloc) IMalloc_Release(imalloc); } @@ -812,20 +814,20 @@ static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT property, LO static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT property, LONG_PTR value) { - xmlwriter *This = impl_from_IXmlWriter(iface); + xmlwriter *writer = impl_from_IXmlWriter(iface); - TRACE("(%p)->(%s %lu)\n", This, debugstr_writer_prop(property), value); + TRACE("%p, %s, %Id.\n", iface, debugstr_writer_prop(property), value); switch (property) { case XmlWriterProperty_Indent: - This->indent = !!value; + writer->indent = !!value; break; case XmlWriterProperty_ByteOrderMark: - This->bom = !!value; + writer->bom = !!value; break; case XmlWriterProperty_OmitXmlDeclaration: - This->omitxmldecl = !!value; + writer->omitxmldecl = !!value; break; default: FIXME("Unimplemented property (%u)\n", property); @@ -1822,9 +1824,9 @@ static HRESULT WINAPI xmlwriteroutput_QueryInterface(IXmlWriterOutput *iface, RE static ULONG WINAPI xmlwriteroutput_AddRef(IXmlWriterOutput *iface) { - xmlwriteroutput *This = impl_from_IXmlWriterOutput(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + xmlwriteroutput *output = impl_from_IXmlWriterOutput(iface); + ULONG ref = InterlockedIncrement(&output->ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -1833,7 +1835,7 @@ static ULONG WINAPI xmlwriteroutput_Release(IXmlWriterOutput *iface) xmlwriteroutput *This = impl_from_IXmlWriterOutput(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (ref == 0) { @@ -1884,7 +1886,7 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) hr = IXmlWriter_QueryInterface(&writer->IXmlWriter_iface, riid, obj); IXmlWriter_Release(&writer->IXmlWriter_iface); - TRACE("returning iface %p, hr %#x\n", *obj, hr); + TRACE("returning iface %p, hr %#lx.\n", *obj, hr); return hr; } -- 2.34.1

1 0

[PATCH 1/2] evr: Fix long types warnings.
by Nikolay Sivov Feb. 1, 2022

Feb. 1, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/Makefile.in | 1 - dlls/evr/evr.c | 2 +- dlls/evr/mixer.c | 72 ++++++++++++++++++++++---------------------- dlls/evr/presenter.c | 40 ++++++++++++------------ dlls/evr/sample.c | 30 +++++++++--------- 5 files changed, 72 insertions(+), 73 deletions(-) diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index 2d86885d650..d5d78252113 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = evr.dll IMPORTLIB = evr IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 user32 d3d9 dxva2 diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 1965fd247de..5e6ca03ea3d 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -109,7 +109,7 @@ static HRESULT WINAPI filter_config_SetNumberOfStreams(IEVRFilterConfig *iface, { struct evr *filter = impl_from_IEVRFilterConfig(iface); - FIXME("filter %p, count %u, stub!\n", filter, count); + FIXME("filter %p, count %lu, stub!\n", filter, count); return E_NOTIMPL; } diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 3d72270fc16..89215b4dec0 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -314,7 +314,7 @@ static ULONG WINAPI video_mixer_inner_AddRef(IUnknown *iface) struct video_mixer *mixer = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&mixer->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -339,7 +339,7 @@ static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) ULONG refcount = InterlockedDecrement(&mixer->refcount); unsigned int i; - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -419,7 +419,7 @@ static HRESULT WINAPI video_mixer_transform_GetStreamIDs(IMFTransform *iface, DW struct video_mixer *mixer = impl_from_IMFTransform(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %p, %u, %p.\n", iface, input_size, inputs, output_size, outputs); + TRACE("%p, %lu, %p, %lu, %p.\n", iface, input_size, inputs, output_size, outputs); EnterCriticalSection(&mixer->cs); if (mixer->input_count > input_size || !output_size) @@ -438,7 +438,7 @@ static HRESULT WINAPI video_mixer_transform_GetInputStreamInfo(IMFTransform *ifa struct input_stream *input; HRESULT hr; - TRACE("%p, %u, %p.\n", iface, id, info); + TRACE("%p, %lu, %p.\n", iface, id, info); EnterCriticalSection(&mixer->cs); @@ -456,7 +456,7 @@ static HRESULT WINAPI video_mixer_transform_GetInputStreamInfo(IMFTransform *ifa static HRESULT WINAPI video_mixer_transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) { - TRACE("%p, %u, %p.\n", iface, id, info); + TRACE("%p, %lu, %p.\n", iface, id, info); if (id) return MF_E_INVALIDSTREAMNUMBER; @@ -488,7 +488,7 @@ static HRESULT WINAPI video_mixer_transform_GetInputStreamAttributes(IMFTransfor struct input_stream *input; HRESULT hr; - TRACE("%p, %u, %p.\n", iface, id, attributes); + TRACE("%p, %lu, %p.\n", iface, id, attributes); EnterCriticalSection(&mixer->cs); @@ -507,7 +507,7 @@ static HRESULT WINAPI video_mixer_transform_GetInputStreamAttributes(IMFTransfor static HRESULT WINAPI video_mixer_transform_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes) { - TRACE("%p, %u, %p.\n", iface, id, attributes); + TRACE("%p, %lu, %p.\n", iface, id, attributes); return E_NOTIMPL; } @@ -519,7 +519,7 @@ static HRESULT WINAPI video_mixer_transform_DeleteInputStream(IMFTransform *ifac unsigned int idx; HRESULT hr; - TRACE("%p, %u.\n", iface, id); + TRACE("%p, %lu.\n", iface, id); if (!id) return MF_E_INVALIDSTREAMNUMBER; @@ -561,7 +561,7 @@ static HRESULT WINAPI video_mixer_transform_AddInputStreams(IMFTransform *iface, unsigned int i, len; HRESULT hr = S_OK; - TRACE("%p, %u, %p.\n", iface, count, ids); + TRACE("%p, %lu, %p.\n", iface, count, ids); if (!ids) return E_POINTER; @@ -620,7 +620,7 @@ static HRESULT WINAPI video_mixer_transform_AddInputStreams(IMFTransform *iface, static HRESULT WINAPI video_mixer_transform_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) { - TRACE("%p, %u, %u, %p.\n", iface, id, index, type); + TRACE("%p, %lu, %lu, %p.\n", iface, id, index, type); return E_NOTIMPL; } @@ -631,7 +631,7 @@ static HRESULT WINAPI video_mixer_transform_GetOutputAvailableType(IMFTransform struct video_mixer *mixer = impl_from_IMFTransform(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %u, %p.\n", iface, id, index, type); + TRACE("%p, %lu, %lu, %p.\n", iface, id, index, type); if (id) return MF_E_INVALIDSTREAMNUMBER; @@ -853,7 +853,7 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW unsigned int count; GUID *guids; - TRACE("%p, %u, %p, %#x.\n", iface, id, media_type, flags); + TRACE("%p, %lu, %p, %#lx.\n", iface, id, media_type, flags); EnterCriticalSection(&mixer->cs); @@ -910,7 +910,7 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D DWORD compare_flags; unsigned int i; - TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); + TRACE("%p, %lu, %p, %#lx.\n", iface, id, type, flags); if (id) return MF_E_INVALIDSTREAMNUMBER; @@ -985,7 +985,7 @@ static HRESULT WINAPI video_mixer_transform_GetInputCurrentType(IMFTransform *if struct input_stream *stream; HRESULT hr; - TRACE("%p, %u, %p.\n", iface, id, type); + TRACE("%p, %lu, %p.\n", iface, id, type); EnterCriticalSection(&mixer->cs); @@ -1010,7 +1010,7 @@ static HRESULT WINAPI video_mixer_transform_GetOutputCurrentType(IMFTransform *i struct video_mixer *mixer = impl_from_IMFTransform(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %p.\n", iface, id, type); + TRACE("%p, %lu, %p.\n", iface, id, type); if (id) return MF_E_INVALIDSTREAMNUMBER; @@ -1036,7 +1036,7 @@ static HRESULT WINAPI video_mixer_transform_GetInputStatus(IMFTransform *iface, struct input_stream *stream; HRESULT hr; - TRACE("%p, %u, %p.\n", iface, id, status); + TRACE("%p, %lu, %p.\n", iface, id, status); if (!status) return E_POINTER; @@ -1106,7 +1106,7 @@ static HRESULT WINAPI video_mixer_transform_SetOutputBounds(IMFTransform *iface, static HRESULT WINAPI video_mixer_transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event) { - FIXME("%p, %u, %p.\n", iface, id, event); + FIXME("%p, %lu, %p.\n", iface, id, event); return E_NOTIMPL; } @@ -1126,7 +1126,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, HRESULT hr = S_OK; unsigned int i; - TRACE("%p, %#x, %#lx.\n", iface, message, param); + TRACE("%p, %#x, %Iu.\n", iface, message, param); EnterCriticalSection(&mixer->cs); @@ -1177,7 +1177,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessInput(IMFTransform *iface, DW struct input_stream *input; HRESULT hr; - TRACE("%p, %u, %p, %#x.\n", iface, id, sample, flags); + TRACE("%p, %lu, %p, %#lx.\n", iface, id, sample, flags); if (!sample) return E_POINTER; @@ -1317,7 +1317,7 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) if (FAILED(hr = video_mixer_get_sample_surface(stream->sample, &surface))) { - WARN("Failed to get source surface for stream %u, hr %#x.\n", i, hr); + WARN("Failed to get source surface for stream %u, hr %#lx.\n", i, hr); break; } @@ -1346,7 +1346,7 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, mixer->input_count, NULL))) { - WARN("Failed to process samples, hr %#x.\n", hr); + WARN("Failed to process samples, hr %#lx.\n", hr); } } @@ -1395,7 +1395,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D unsigned int i; HRESULT hr; - TRACE("%p, %#x, %u, %p, %p.\n", iface, flags, count, buffers, status); + TRACE("%p, %#lx, %lu, %p, %p.\n", iface, flags, count, buffers, status); if (!buffers || !count || count > 1 || !buffers->pSample) return E_INVALIDARG; @@ -1572,7 +1572,7 @@ static HRESULT WINAPI video_mixer_service_client_InitServicePointers(IMFTopology if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, &MR_VIDEO_RENDER_SERVICE, &IID_IMediaEventSink, (void **)&mixer->event_sink, &count))) { - WARN("Failed to get renderer event sink, hr %#x.\n", hr); + WARN("Failed to get renderer event sink, hr %#lx.\n", hr); } LeaveCriticalSection(&mixer->cs); @@ -1630,7 +1630,7 @@ static HRESULT WINAPI video_mixer_control_SetStreamZOrder(IMFVideoMixerControl2 struct input_stream *stream; HRESULT hr; - TRACE("%p, %u, %u.\n", iface, id, zorder); + TRACE("%p, %lu, %lu.\n", iface, id, zorder); /* Can't change reference stream. */ if (!id && zorder) @@ -1663,7 +1663,7 @@ static HRESULT WINAPI video_mixer_control_GetStreamZOrder(IMFVideoMixerControl2 struct input_stream *stream; HRESULT hr; - TRACE("%p, %u, %p.\n", iface, id, zorder); + TRACE("%p, %lu, %p.\n", iface, id, zorder); if (!zorder) return E_POINTER; @@ -1685,7 +1685,7 @@ static HRESULT WINAPI video_mixer_control_SetStreamOutputRect(IMFVideoMixerContr struct input_stream *stream; HRESULT hr; - TRACE("%p, %u, %s.\n", iface, id, debugstr_normalized_rect(rect)); + TRACE("%p, %lu, %s.\n", iface, id, debugstr_normalized_rect(rect)); if (!rect) return E_POINTER; @@ -1713,7 +1713,7 @@ static HRESULT WINAPI video_mixer_control_GetStreamOutputRect(IMFVideoMixerContr struct input_stream *stream; HRESULT hr; - TRACE("%p, %u, %p.\n", iface, id, rect); + TRACE("%p, %lu, %p.\n", iface, id, rect); if (!rect) return E_POINTER; @@ -1732,7 +1732,7 @@ static HRESULT WINAPI video_mixer_control_SetMixingPrefs(IMFVideoMixerControl2 * { struct video_mixer *mixer = impl_from_IMFVideoMixerControl2(iface); - TRACE("%p, %#x.\n", iface, flags); + TRACE("%p, %#lx.\n", iface, flags); EnterCriticalSection(&mixer->cs); mixer->mixing_flags = flags; @@ -1898,7 +1898,7 @@ static ULONG WINAPI video_mixer_position_mapper_Release(IMFVideoPositionMapper * static HRESULT WINAPI video_mixer_position_mapper_MapOutputCoordinateToInputStream(IMFVideoPositionMapper *iface, float x_out, float y_out, DWORD output_stream, DWORD input_stream, float *x_in, float *y_in) { - FIXME("%p, %f, %f, %u, %u, %p, %p.\n", iface, x_out, y_out, output_stream, input_stream, x_in, y_in); + FIXME("%p, %f, %f, %lu, %lu, %p, %p.\n", iface, x_out, y_out, output_stream, input_stream, x_in, y_in); return E_NOTIMPL; } @@ -1961,42 +1961,42 @@ static HRESULT WINAPI video_mixer_processor_SetVideoProcessorMode(IMFVideoProces static HRESULT WINAPI video_mixer_processor_GetProcAmpRange(IMFVideoProcessor *iface, DWORD prop, DXVA2_ValueRange *range) { - FIXME("%p, %#x, %p.\n", iface, prop, range); + FIXME("%p, %#lx, %p.\n", iface, prop, range); return E_NOTIMPL; } static HRESULT WINAPI video_mixer_processor_GetProcAmpValues(IMFVideoProcessor *iface, DWORD flags, DXVA2_ProcAmpValues *values) { - FIXME("%p, %#x, %p.\n", iface, flags, values); + FIXME("%p, %#lx, %p.\n", iface, flags, values); return E_NOTIMPL; } static HRESULT WINAPI video_mixer_processor_SetProcAmpValues(IMFVideoProcessor *iface, DWORD flags, DXVA2_ProcAmpValues *values) { - FIXME("%p, %#x, %p.\n", iface, flags, values); + FIXME("%p, %#lx, %p.\n", iface, flags, values); return E_NOTIMPL; } static HRESULT WINAPI video_mixer_processor_GetFilteringRange(IMFVideoProcessor *iface, DWORD prop, DXVA2_ValueRange *range) { - FIXME("%p, %#x, %p.\n", iface, prop, range); + FIXME("%p, %#lx, %p.\n", iface, prop, range); return E_NOTIMPL; } static HRESULT WINAPI video_mixer_processor_GetFilteringValue(IMFVideoProcessor *iface, DWORD prop, DXVA2_Fixed32 *value) { - FIXME("%p, %#x, %p.\n", iface, prop, value); + FIXME("%p, %#lx, %p.\n", iface, prop, value); return E_NOTIMPL; } static HRESULT WINAPI video_mixer_processor_SetFilteringValue(IMFVideoProcessor *iface, DWORD prop, DXVA2_Fixed32 *value) { - FIXME("%p, %#x, %p.\n", iface, prop, value); + FIXME("%p, %#lx, %p.\n", iface, prop, value); return E_NOTIMPL; } @@ -2037,7 +2037,7 @@ static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor { struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); - TRACE("%p, %#x.\n", iface, color); + TRACE("%p, %#lx.\n", iface, color); EnterCriticalSection(&mixer->cs); if (mixer->bkgnd_color.rgba != color) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index cf8ba20cbb8..910af2891e3 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -320,7 +320,7 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, presenter->frame_time_threshold = frametime / 4; } else - WARN("Failed to initialize sample allocator, hr %#x.\n", hr); + WARN("Failed to initialize sample allocator, hr %#lx.\n", hr); return hr; } @@ -387,7 +387,7 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre /* FIXME: check that d3d device supports this format */ if (FAILED(hr = IMFMediaType_CopyAllItems(candidate_type, (IMFAttributes *)media_type))) - WARN("Failed to clone a media type, hr %#x.\n", hr); + WARN("Failed to clone a media type, hr %#lx.\n", hr); IMFMediaType_Release(candidate_type); hr = video_presenter_configure_output_type(presenter, &aperture, media_type); @@ -490,13 +490,13 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM if (FAILED(hr = video_presenter_get_sample_surface(sample, &surface))) { - WARN("Failed to get sample surface, hr %#x.\n", hr); + WARN("Failed to get sample surface, hr %#lx.\n", hr); return; } if (FAILED(hr = IDirect3DSwapChain9_GetBackBuffer(presenter->swapchain, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer))) { - WARN("Failed to get a backbuffer, hr %#x.\n", hr); + WARN("Failed to get a backbuffer, hr %#lx.\n", hr); IDirect3DSurface9_Release(surface); return; } @@ -603,7 +603,7 @@ static HRESULT video_presenter_process_input(struct video_presenter *presenter) if (FAILED(hr = IMFVideoSampleAllocator_AllocateSample(presenter->allocator, &sample))) { - WARN("Failed to allocate a sample, hr %#x.\n", hr); + WARN("Failed to allocate a sample, hr %#lx.\n", hr); break; } @@ -722,7 +722,7 @@ static HRESULT video_presenter_start_streaming(struct video_presenter *presenter CloseHandle(presenter->thread.ready_event); presenter->thread.ready_event = NULL; - TRACE("Started streaming thread, tid %#x.\n", presenter->thread.tid); + TRACE("Started streaming thread, tid %#lx.\n", presenter->thread.tid); return S_OK; } @@ -737,7 +737,7 @@ static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) WaitForSingleObject(presenter->thread.hthread, INFINITE); CloseHandle(presenter->thread.hthread); - TRACE("Terminated streaming thread tid %#x.\n", presenter->thread.tid); + TRACE("Terminated streaming thread tid %#lx.\n", presenter->thread.tid); memset(&presenter->thread, 0, sizeof(presenter->thread)); video_presenter_set_allocator_callback(presenter, NULL); @@ -816,7 +816,7 @@ static ULONG WINAPI video_presenter_inner_AddRef(IUnknown *iface) struct video_presenter *presenter = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&presenter->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -839,7 +839,7 @@ static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) struct video_presenter *presenter = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&presenter->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -952,7 +952,7 @@ static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, M struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); HRESULT hr; - TRACE("%p, %d, %lu.\n", iface, message, param); + TRACE("%p, %d, %Iu.\n", iface, message, param); EnterCriticalSection(&presenter->cs); @@ -1095,7 +1095,7 @@ static void video_presenter_set_mixer_rect(struct video_presenter *presenter) if (FAILED(hr = IMFAttributes_SetBlob(attributes, &VIDEO_ZOOM_RECT, (const UINT8 *)&presenter->src_rect, sizeof(presenter->src_rect)))) { - WARN("Failed to set zoom rectangle attribute, hr %#x.\n", hr); + WARN("Failed to set zoom rectangle attribute, hr %#lx.\n", hr); } IMFAttributes_Release(attributes); } @@ -1112,7 +1112,7 @@ static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, I if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, &MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, (void **)&presenter->mixer, &count))) { - WARN("Failed to get mixer interface, hr %#x.\n", hr); + WARN("Failed to get mixer interface, hr %#lx.\n", hr); return hr; } @@ -1174,7 +1174,7 @@ static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopo if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, &MR_VIDEO_RENDER_SERVICE, &IID_IMediaEventSink, (void **)&presenter->event_sink, &count))) { - WARN("Failed to get renderer event sink, hr %#x.\n", hr); + WARN("Failed to get renderer event sink, hr %#lx.\n", hr); } } @@ -1350,7 +1350,7 @@ static HRESULT WINAPI video_presenter_control_SetAspectRatioMode(IMFVideoDisplay { struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - TRACE("%p, %#x.\n", iface, mode); + TRACE("%p, %#lx.\n", iface, mode); if (mode & ~MFVideoARMode_Mask) return E_INVALIDARG; @@ -1468,7 +1468,7 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon static HRESULT WINAPI video_presenter_control_SetBorderColor(IMFVideoDisplayControl *iface, COLORREF color) { - FIXME("%p, %#x.\n", iface, color); + FIXME("%p, %#lx.\n", iface, color); return E_NOTIMPL; } @@ -1482,7 +1482,7 @@ static HRESULT WINAPI video_presenter_control_GetBorderColor(IMFVideoDisplayCont static HRESULT WINAPI video_presenter_control_SetRenderingPrefs(IMFVideoDisplayControl *iface, DWORD flags) { - FIXME("%p, %#x.\n", iface, flags); + FIXME("%p, %#lx.\n", iface, flags); return E_NOTIMPL; } @@ -1654,7 +1654,7 @@ static ULONG WINAPI video_presenter_position_mapper_Release(IMFVideoPositionMapp static HRESULT WINAPI video_presenter_position_mapper_MapOutputCoordinateToInputStream(IMFVideoPositionMapper *iface, float x_out, float y_out, DWORD output_stream, DWORD input_stream, float *x_in, float *y_in) { - FIXME("%p, %f, %f, %u, %u, %p, %p.\n", iface, x_out, y_out, output_stream, input_stream, x_in, y_in); + FIXME("%p, %f, %f, %lu, %lu, %p, %p.\n", iface, x_out, y_out, output_stream, input_stream, x_in, y_in); return E_NOTIMPL; } @@ -2028,14 +2028,14 @@ static HRESULT video_presenter_init_d3d(struct video_presenter *presenter) if (FAILED(hr)) { - WARN("Failed to create d3d device, hr %#x.\n", hr); + WARN("Failed to create d3d device, hr %#lx.\n", hr); return hr; } hr = IDirect3DDeviceManager9_ResetDevice(presenter->device_manager, device, presenter->reset_token); IDirect3DDevice9_Release(device); if (FAILED(hr)) - WARN("Failed to set new device for the manager, hr %#x.\n", hr); + WARN("Failed to set new device for the manager, hr %#lx.\n", hr); if (SUCCEEDED(hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&presenter->allocator))) { @@ -2080,7 +2080,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) if (FAILED(hr = video_presenter_init_d3d(object))) { - WARN("Failed to initialize d3d device, hr %#x.\n", hr); + WARN("Failed to initialize d3d device, hr %#lx.\n", hr); goto failed; } diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index cbba384e181..1d29b6cdc2c 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -147,7 +147,7 @@ static ULONG WINAPI tracked_async_result_AddRef(IMFAsyncResult *iface) struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); ULONG refcount = InterlockedIncrement(&result->refcount); - TRACE("%p, %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -157,7 +157,7 @@ static ULONG WINAPI tracked_async_result_Release(IMFAsyncResult *iface) struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); ULONG refcount = InterlockedDecrement(&result->refcount); - TRACE("%p, %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -201,7 +201,7 @@ static HRESULT WINAPI tracked_async_result_SetStatus(IMFAsyncResult *iface, HRES { struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); - TRACE("%p, %#x.\n", iface, status); + TRACE("%p, %#lx.\n", iface, status); result->result.hrStatusResult = status; @@ -351,7 +351,7 @@ static void video_sample_create_tracking_thread(void) WaitForSingleObject(ready_event, INFINITE); CloseHandle(ready_event); - TRACE("Create tracking thread %#x.\n", tracking_thread.tid); + TRACE("Create tracking thread %#lx.\n", tracking_thread.tid); } LeaveCriticalSection(&tracking_thread_cs); @@ -450,7 +450,7 @@ static ULONG WINAPI sample_allocator_AddRef(IMFVideoSampleAllocator *iface) struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocator(iface); ULONG refcount = InterlockedIncrement(&allocator->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -478,7 +478,7 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocator *iface) struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocator(iface); ULONG refcount = InterlockedDecrement(&allocator->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -575,7 +575,7 @@ static HRESULT sample_allocator_create_samples(struct sample_allocator *allocato if (FAILED(hr)) { - WARN("Failed to get processor service, %#x.\n", hr); + WARN("Failed to get processor service, %#lx.\n", hr); return hr; } } @@ -638,7 +638,7 @@ static HRESULT WINAPI sample_allocator_InitializeSampleAllocator(IMFVideoSampleA struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocator(iface); HRESULT hr; - TRACE("%p, %u, %p.\n", iface, sample_count, media_type); + TRACE("%p, %lu, %p.\n", iface, sample_count, media_type); if (!sample_count) sample_count = 1; @@ -912,7 +912,7 @@ static ULONG WINAPI video_sample_AddRef(IMFSample *iface) struct video_sample *sample = impl_from_IMFSample(iface); ULONG refcount = InterlockedIncrement(&sample->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -934,7 +934,7 @@ static ULONG WINAPI video_sample_Release(IMFSample *iface) refcount = InterlockedDecrement(&sample->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1232,7 +1232,7 @@ static HRESULT WINAPI video_sample_SetSampleFlags(IMFSample *iface, DWORD flags) { struct video_sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %#x.\n", iface, flags); + TRACE("%p, %#lx.\n", iface, flags); return IMFSample_SetSampleFlags(sample->sample, flags); } @@ -1312,7 +1312,7 @@ static HRESULT WINAPI video_sample_GetBufferByIndex(IMFSample *iface, DWORD inde { struct video_sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %u, %p.\n", iface, index, buffer); + TRACE("%p, %lu, %p.\n", iface, index, buffer); return IMFSample_GetBufferByIndex(sample->sample, index, buffer); } @@ -1337,7 +1337,7 @@ static HRESULT WINAPI video_sample_RemoveBufferByIndex(IMFSample *iface, DWORD i { struct video_sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %u.\n", iface, index); + TRACE("%p, %lu.\n", iface, index); return IMFSample_RemoveBufferByIndex(sample->sample, index); } @@ -1585,7 +1585,7 @@ static ULONG WINAPI surface_buffer_AddRef(IMFMediaBuffer *iface) struct surface_buffer *buffer = impl_from_IMFMediaBuffer(iface); ULONG refcount = InterlockedIncrement(&buffer->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -1595,7 +1595,7 @@ static ULONG WINAPI surface_buffer_Release(IMFMediaBuffer *iface) struct surface_buffer *buffer = impl_from_IMFMediaBuffer(iface); ULONG refcount = InterlockedDecrement(&buffer->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { -- 2.34.1

1 1

[PATCH vkd3d 1/2] tests: Set the wrong descriptor heaps in test_descriptor_tables().
by Conor McCarthy Feb. 1, 2022

Feb. 1, 2022

Has no effect in Windows at least on AMD. Not calling SetDescriptorHeaps() at all has no effect in Windows on any hardware so this is likely to be universal too. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3b0c4242..df93b71a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16067,7 +16067,7 @@ static void test_srv_component_mapping(void) static void test_descriptor_tables(void) { - ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2]; + ID3D12DescriptorHeap *heap, *sampler_heap, *wrong_heap, *wrong_sampler_heap, *heaps[2]; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; D3D12_DESCRIPTOR_RANGE descriptor_range[4]; D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc; @@ -16194,6 +16194,8 @@ static void test_descriptor_tables(void) heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 6); sampler_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 1); + wrong_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 6); + wrong_sampler_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 1); descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); @@ -16237,7 +16239,7 @@ static void test_descriptor_tables(void) ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - heaps[0] = heap; heaps[1] = sampler_heap; + heaps[0] = wrong_heap; heaps[1] = wrong_sampler_heap; ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 1, @@ -16258,6 +16260,8 @@ static void test_descriptor_tables(void) ID3D12Resource_Release(textures[i]); ID3D12DescriptorHeap_Release(heap); ID3D12DescriptorHeap_Release(sampler_heap); + ID3D12DescriptorHeap_Release(wrong_heap); + ID3D12DescriptorHeap_Release(wrong_sampler_heap); destroy_test_context(&context); } -- 2.34.1

3 5

[tools] testbot/SetWinLocale: Add support for the Powershell locale APIs.
by Francois Gouget Feb. 1, 2022

Feb. 1, 2022

Doing so requires Windows 8+ so keep the intl.cpl code path as a fallback. Support for --sys-copy and --def-copy even requires Windows 11 so keep leveraging intl.cpl to perform the copies. Allow skipping the Powershell APIs by passing --use-intl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The Powershell APIs work a bit differently from intl.cpl: * They automatically set the code pages to UTF-8 for Unicode-only system locales (e.g. Hindi) whereas intl.cpl just fails to modify the system locale in that case. * They automatically adjust the display language locale, for instance from en-CA to en-GB, when again intl.cpl just fails in such a case. Unfortunately these differences make the SetWinLocale behavior a bit inconsistent between these two code paths. --- testbot/bin/SetWinLocale | 21 +++++++++++----- testbot/bin/SetWinLocale.ps1 | 49 ++++++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 81bb2212b1..9f89280ab9 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -316,7 +316,7 @@ sub CheckLocale($$) return undef; } -my ($OptHostName, $OptShow, $OptSysCopy, $OptDefCopy, $OptReboot); +my ($OptHostName, $OptShow, $OptSysCopy, $OptDefCopy, $OptUseIntl, $OptReboot); my ($OptDefault, $OptLocale, $OptCountry, $OptSystem, $OptUTF8, $OptMUI, $OptKeyboard); while (@ARGV) { @@ -329,6 +329,10 @@ while (@ARGV) { $OptShow = 1; } + elsif ($Arg eq "--use-intl") + { + $OptUseIntl = 1; + } elsif ($Arg eq "--sys-copy") { $OptSysCopy = 1; @@ -457,15 +461,16 @@ if (!defined $Usage) Error("you must specify at least one locale to change\n"); $Usage = 2; } - if (defined $OptReboot) + if ($OptUseIntl or defined $OptReboot) { - Error("--(no-)reboot can only be used when changing a locale\n"); + Error("--use-intl and --(no-)reboot can only be used when changing a locale\n"); $Usage = 2; } } if ($OptShow and ($OptLocale or $OptCountry or $OptSystem or $OptUTF8 or $OptMUI or $OptKeyboard or defined $OptSysCopy or - defined $OptDefCopy or defined $OptReboot)) + defined $OptDefCopy or defined $OptUseIntl or + defined $OptReboot)) { Error("--show and the locale options are mutually incompatible\n"); $Usage = 2; @@ -488,7 +493,7 @@ if (defined $Usage) exit $Usage; } print "Usage: $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-sys-copy] [--no-def-copy] [--no-reboot] HOSTNAME\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-sys-copy] [--no-def-copy] [--use-intl] [--no-reboot] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; @@ -563,6 +568,9 @@ if (defined $Usage) print " . Powershell (Windows 11+): Copy-UserInternationalSettingsToSystem -NewUser \$True\n"; print " . Intl.cpl: CopySettingsToDefaultUserAcct='true'\n"; print " --no-def-copy Do not copy the current locales to the default user account.\n"; + print " --use-intl Change the locale using the intl.cpl control panel module\n"; + print " instead of Powershell. This option should only be used for\n"; + print " debugging.\n"; print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; print " effect after the next reboot. This will also prevent working\n"; print " around cases where some locale changes do not stick after a\n"; @@ -835,7 +843,8 @@ sub SetWinLocales($$$$$$$$) "$name0.ps1", "locales", $Locale || ".", $CountryId || ".", $System || ".", $UTF8 ? "true" : "false", $MUI || ".", $KeyboardIds ? $KeyboardIds->[0] : ".", - $SysCopy ? "true" : "false", $DefCopy ? "true" : "false"]; + $SysCopy ? "true" : "false", $DefCopy ? "true" : "false", + $OptUseIntl ? "true" : "false"]; Debug(Elapsed($Start), " Running: ", join(" ", @$Cmd), "\n"); my $Ret = $TA->RunAndWait($Cmd, 0, 30, undef, "$name0.out", "$name0.out"); FatalError("$name0.ps1 locales failed: ", $TA->GetLastError(), "\n") if ($Ret < 0); diff --git a/testbot/bin/SetWinLocale.ps1 b/testbot/bin/SetWinLocale.ps1 index afb60d6ee5..00e9a1af14 100644 --- a/testbot/bin/SetWinLocale.ps1 +++ b/testbot/bin/SetWinLocale.ps1 @@ -188,6 +188,40 @@ function SetCodePages($Value) } } +$SWC_Success = $True + +function SetWinCulture([string]$Locale, [string]$CountryId, [string]$System, [bool]$UTF8, [string]$MUI, [string]$KeyboardId, [bool]$SysCopy, [bool]$DefCopy) +{ + $Cmd = Get-Command Set-Culture -ErrorAction SilentlyContinue + if ($Cmd -eq $null) { + Write-Output "Set-Culture is not supported" + $global:SWC_Success = $False + return + } + + if ($Locale) { Set-Culture $Locale } + if ($CountryId) { Set-WinHomeLocation $CountryId } + if ($System) { Set-WinSystemLocale $System } + if ($UTF8) { SetCodePages(65001) } + if ($MUI) { Set-WinUILanguageOverride $MUI } + if ($KeyboardId) { Set-WinDefaultInputMethodOverride $KeyboardId } + if ($SysCopy -or $DefCopy) + { + $Cmd = Get-Command Copy-UserInternationalSettingsToSystem -ErrorAction SilentlyContinue + if ($Cmd -ne $null) + { + Copy-UserInternationalSettingsToSystem -WelcomeScreen $SysCopy -NewUser $DefCopy + } + else + { + Write-Output "Copy-UserInternationalSettingsToSystem is not supported. Falling back to intl.cpl for the locales copies." + WriteIntlCplConfig $undef $undef $undef $undef $undef $SysCopy $DefCopy >"$Name0.xml" + RunIntlCpl "$Name0.xml" + Remove-Item -Path "$Name0.xml" + } + } +} + # # The locale-change actions @@ -226,6 +260,14 @@ function SetLocales($Argv) $DefCopy = $Argv[8] -ne "false" $UseIntlCpl = $Argv[9] -eq "true" + if ($UseIntlCpl -eq $False) + { + Write-OutPut "Setting the locales using the Powershell APIs" + SetWinCulture $Locale $CountryId $System $UTF8 $MUI $KeyboardId $SysCopy $DefCopy + if ($SWC_Success -eq $True) { exit 0 } + Write-Output "Falling back to intl.cpl" + } + WriteIntlCplConfig $Locale $CountryId $System $MUI $KeyboardId $SysCopy $DefCopy >"$Name0.xml" RunIntlCpl "$Name0.xml" Remove-Item -Path "$Name0.xml" @@ -243,7 +285,7 @@ function ShowUsage() { Write-Output "Usage: $Name0 settings" Write-Output "or $Name0 intlconfig LOCALE COUNTRYID SYSTEM UTF8 MUI KEYBOARDID SYSCOPY DEFCOPY" - Write-Output "or $Name0 locales LOCALE COUNTRYID SYSTEM UTF8 MUI KEYBOARDID SYSCOPY DEFCOPY" + Write-Output "or $Name0 locales LOCALE COUNTRYID SYSTEM UTF8 MUI KEYBOARDID SYSCOPY DEFCOPY USEINTLCPL" Write-Output "or $Name0 -?" Write-Output "" Write-Output "Shows or modifies the Windows locales." @@ -251,7 +293,8 @@ function ShowUsage() Write-Output "Where:" Write-Output " settings Show the current Windows locale settings." Write-Output " intlconfig Generates an XML configuration file for intl.cpl." - Write-Output " locales Modifies the locales by invoking intl.cpl." + Write-Output " locales Modifies the locales either through the Powershell APIs or" + Write-Output " intl.cpl." Write-Output " LOCALE Is the BCP-47 locale to use for formats, date and time." Write-Output " COUNTRYID Is the numerical country code." Write-Output " SYSTEM Is the BCP-47 locale to use as the system locale." @@ -262,6 +305,8 @@ function ShowUsage() Write-Output " (such as used for the logon screen). This is the default." Write-Output " DEFCOPY If 'true' the locale settings will be copied to the default account" Write-Output " (for new users). This is the default." + Write-Output " USEINTLCPL If 'true' apply the changes using intl.cpl instead of first trying" + Write-Output " the Powershell APIs." Write-Output " -? Shows this help message." } -- 2.30.2

1 0

[PATCH 1/3] d3d11: Always initialize out view pointer in CreateShaderResourceView().
by Nikolay Sivov Feb. 1, 2022

Feb. 1, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 6 ++++++ dlls/d3d11/device.c | 4 ++++ dlls/d3d11/tests/d3d11.c | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index ea710038e17..f8dcbb8cb47 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -3555,8 +3555,10 @@ static void test_create_shader_resource_view(void) buffer = create_buffer(device, D3D10_BIND_SHADER_RESOURCE, 1024, NULL); + srview = (void *)0xdeadbeef; hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, NULL, &srview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!srview, "Unexpected pointer %p\n", srview); srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; @@ -3586,8 +3588,10 @@ static void test_create_shader_resource_view(void) /* Without D3D10_BIND_SHADER_RESOURCE. */ buffer = create_buffer(device, 0, 1024, NULL); + srview = (void *)0xdeadbeef; hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &srview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!srview, "Unexpected pointer %p\n", srview); ID3D10Buffer_Release(buffer); @@ -3693,9 +3697,11 @@ static void test_create_shader_resource_view(void) texture = (ID3D10Resource *)texture3d; } + srview = (void *)0xdeadbeef; get_srv_desc(&srv_desc, &invalid_desc_tests[i].srv_desc); hr = ID3D10Device_CreateShaderResourceView(device, texture, &srv_desc, &srview); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!srview, "Unexpected pointer %p.\n", srview); ID3D10Resource_Release(texture); } diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f0cbb1741ab..858cd9f6d4a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3377,6 +3377,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Dev TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (!resource) return E_INVALIDARG; @@ -6021,6 +6023,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView1(ID3D10De TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (!resource) return E_INVALIDARG; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 56747e7168c..1db367f39fa 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4371,16 +4371,20 @@ static void test_create_shader_resource_view(void) buffer = create_buffer(device, D3D11_BIND_SHADER_RESOURCE, 1024, NULL); + srview = (void *)0xdeadbeef; hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, NULL, &srview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!srview, "Unexpected pointer %p.\n", srview); srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; srv_desc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER; U1(U(srv_desc).Buffer).ElementOffset = 0; U2(U(srv_desc).Buffer).ElementWidth = 64; + srview = (void *)0xdeadbeef; hr = ID3D11Device_CreateShaderResourceView(device, NULL, &srv_desc, &srview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!srview, "Unexpected pointer %p.\n", srview); expected_refcount = get_refcount(device) + 1; hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srview); @@ -4405,8 +4409,10 @@ static void test_create_shader_resource_view(void) /* Without D3D11_BIND_SHADER_RESOURCE. */ buffer = create_buffer(device, 0, 1024, NULL); + srview = (void *)0xdeadbeef; hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!srview, "Unexpected pointer %p.\n", srview); ID3D11Buffer_Release(buffer); @@ -4564,9 +4570,11 @@ static void test_create_shader_resource_view(void) texture = (ID3D11Resource *)texture3d; } + srview = (void *)0xdeadbeef; get_srv_desc(&srv_desc, &invalid_desc_tests[i].srv_desc); hr = ID3D11Device_CreateShaderResourceView(device, texture, &srv_desc, &srview); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!srview, "Unexpected pointer %p.\n", srview); ID3D11Resource_Release(texture); } -- 2.34.1

3 8

[PATCH 5/5] user32: Destroy window server objects from destroy_thread_windows.
by Jacek Caban Feb. 1, 2022

Feb. 1, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 9 +++++++++ server/window.c | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-)

1 0

[PATCH 4/5] user32: Use a single lock in destroy_thread_windows.
by Jacek Caban Feb. 1, 2022

Feb. 1, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This is a preparation for the next patch, which makes sure that there is no inconsistency between server and user32 view of window handles after destroy_thread_windows is done in user32, but not yet in server. This is probably not a big deal right now (although it's not right either), my main motivation is a rework of handles that I'm working on. If this and the next patch are not convincing alone, please hold them. I plan to share more patches for a better context soon, but I don't have them cleaned up enough yet. dlls/user32/win.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-)

1 0

[PATCH 3/5] server: Notify child window thread in detach_child_window.
by Jacek Caban Feb. 1, 2022

Feb. 1, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Having WM_WINE_* in ntuser.h is not right long term, we will want it to be private to server and win32u, but it makes the conversion more convenient for now. dlls/user32/user_private.h | 18 ------------------ dlls/user32/win.c | 12 +----------- include/ntuser.h | 19 +++++++++++++++++++ server/window.c | 6 +++--- 4 files changed, 23 insertions(+), 32 deletions(-)

1 0

[PATCH 1/5] include: InterlockedExchangeAdd64 msvc intrinsic does not exist in x86.
by Stefan Dösinger Feb. 1, 2022

Feb. 1, 2022

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Verified with a stand-alone Visual Studio project. There's also a lower-case _interlockedexchangeadd64 intrinsic for arm, arm64 and x86_64, but not x86. --- include/winnt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 18d9fa656f8..66a591ddaf2 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6292,7 +6292,6 @@ typedef enum _PROCESS_MITIGATION_POLICY #pragma intrinsic(_InterlockedCompareExchange64) #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) -#pragma intrinsic(_InterlockedExchangeAdd64) #pragma intrinsic(_InterlockedIncrement) #pragma intrinsic(_InterlockedIncrement16) #pragma intrinsic(_InterlockedDecrement) @@ -6309,7 +6308,6 @@ long _InterlockedDecrement(long volatile*); short _InterlockedDecrement16(short volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); -long long _InterlockedExchangeAdd64(long long volatile*,long long); long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); @@ -6352,9 +6350,11 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__x86_64__) +#pragma intrinsic(_InterlockedExchangeAdd64) #pragma intrinsic(__faststorefence) void __faststorefence(void); +long long _InterlockedExchangeAdd64(long long volatile *, long long); static FORCEINLINE void MemoryBarrier(void) { -- 2.34.1

1 4

[PATCH 2/3] msi: Use CRT allocation functions.
by Hans Leidekker Feb. 1, 2022

Feb. 1, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/custom.c | 5 ++--- dlls/msi/handle.c | 6 +++--- dlls/msi/install.c | 17 ++++++++--------- dlls/msi/msipriv.h | 16 +++++----------- dlls/msi/package.c | 15 +++++++-------- dlls/msi/streams.c | 3 ++- dlls/msi/string.c | 10 ++++------ dlls/msi/where.c | 3 ++- 8 files changed, 33 insertions(+), 42 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index ee4f59b5faa..94c159c6a2a 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -36,7 +36,6 @@ #include "msipriv.h" #include "winemsi.h" #include "wine/asm.h" -#include "wine/heap.h" #include "wine/debug.h" #include "wine/exception.h" @@ -68,12 +67,12 @@ static struct list msi_pending_custom_actions = LIST_INIT( msi_pending_custom_ac void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) { - return heap_alloc(len); + return malloc(len); } void __RPC_USER MIDL_user_free(void __RPC_FAR * ptr) { - heap_free(ptr); + free(ptr); } LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) diff --git a/dlls/msi/handle.c b/dlls/msi/handle.c index 0881833ff68..26d8e7d7f85 100644 --- a/dlls/msi/handle.c +++ b/dlls/msi/handle.c @@ -92,13 +92,13 @@ static MSIHANDLE alloc_handle_table_entry(void) if (msihandletable_size == 0) { newsize = 256; - p = msi_alloc_zero(newsize*sizeof(msi_handle_info)); + p = msi_alloc_zero(newsize * sizeof(*p)); } else { newsize = msihandletable_size * 2; - p = msi_realloc_zero(msihandletable, - newsize*sizeof(msi_handle_info)); + p = msi_realloc(msihandletable, newsize * sizeof(*p)); + if (p) memset(p + msihandletable_size, 0, (newsize - msihandletable_size) * sizeof(*p)); } if (!p) return 0; diff --git a/dlls/msi/install.c b/dlls/msi/install.c index a3bfb53cfff..4d909b67682 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -34,7 +34,6 @@ #include "msipriv.h" #include "winemsi.h" -#include "wine/heap.h" #include "wine/debug.h" #include "wine/exception.h" @@ -273,7 +272,7 @@ UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DW if (!(remote = msi_get_remote(hinst))) { - heap_free(folderW); + free(folderW); return ERROR_INVALID_HANDLE; } @@ -291,7 +290,7 @@ UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DW r = msi_strncpyWtoA(path, -1, buf, sz, TRUE); midl_user_free(path); - heap_free(folderW); + free(folderW); return r; } @@ -301,7 +300,7 @@ UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DW else r = ERROR_DIRECTORY; - heap_free(folderW); + free(folderW); msiobj_release(&package->hdr); return r; } @@ -429,7 +428,7 @@ UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DW if (!(remote = msi_get_remote(hinst))) { - heap_free(folderW); + free(folderW); return ERROR_INVALID_HANDLE; } @@ -447,7 +446,7 @@ UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DW r = msi_strncpyWtoA(path, -1, buf, sz, TRUE); midl_user_free(path); - heap_free(folderW); + free(folderW); return r; } @@ -457,8 +456,8 @@ UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DW else r = ERROR_DIRECTORY; - heap_free(path); - heap_free(folderW); + free(path); + free(folderW); msiobj_release(&package->hdr); return r; } @@ -509,7 +508,7 @@ UINT WINAPI MsiGetSourcePathW(MSIHANDLE hinst, const WCHAR *folder, WCHAR *buf, else r = ERROR_DIRECTORY; - heap_free(path); + free(path); msiobj_release(&package->hdr); return r; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 15130446b04..b5838bad6fe 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1141,30 +1141,24 @@ extern void msi_ui_progress(MSIPACKAGE *, int, int, int, int) DECLSPEC_HIDDEN; static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *msi_alloc( size_t len ) { - return HeapAlloc( GetProcessHeap(), 0, len ); + return malloc( len ); } static void *msi_alloc_zero( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *msi_alloc_zero( size_t len ) { - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + return calloc( 1, len ); } static void *msi_realloc( void *mem, size_t len ) __WINE_ALLOC_SIZE(2); static inline void *msi_realloc( void *mem, size_t len ) { - return HeapReAlloc( GetProcessHeap(), 0, mem, len ); + return realloc( mem, len ); } -static void *msi_realloc_zero( void *mem, size_t len ) __WINE_ALLOC_SIZE(2); -static inline void *msi_realloc_zero( void *mem, size_t len ) +static inline void msi_free( void *mem ) { - return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); -} - -static inline BOOL msi_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); + free( mem ); } static inline char *strdupWtoA( LPCWSTR str ) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7488c095080..349d7c0ffa3 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -43,7 +43,6 @@ #include "msidefs.h" #include "sddl.h" -#include "wine/heap.h" #include "wine/debug.h" #include "wine/exception.h" @@ -2272,7 +2271,7 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD if (!(remote = msi_get_remote(hinst))) { - heap_free(nameW); + free(nameW); return ERROR_INVALID_HANDLE; } @@ -2286,13 +2285,13 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD } __ENDTRY - heap_free(nameW); + free(nameW); if (!r) { /* String might contain embedded nulls. * Native returns the correct size but truncates the string. */ - tmp = heap_alloc_zero((len + 1) * sizeof(WCHAR)); + tmp = calloc(1, (len + 1) * sizeof(WCHAR)); if (!tmp) { midl_user_free(value); @@ -2302,7 +2301,7 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD r = msi_strncpyWtoA(tmp, len, buf, sz, TRUE); - heap_free(tmp); + free(tmp); } midl_user_free(value); return r; @@ -2314,7 +2313,7 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD r = msi_strncpyWtoA(value, len, buf, sz, FALSE); - heap_free(nameW); + free(nameW); if (row) msiobj_release(&row->hdr); msiobj_release(&package->hdr); return r; @@ -2355,7 +2354,7 @@ UINT WINAPI MsiGetPropertyW(MSIHANDLE hinst, const WCHAR *name, WCHAR *buf, DWOR { /* String might contain embedded nulls. * Native returns the correct size but truncates the string. */ - tmp = heap_alloc_zero((len + 1) * sizeof(WCHAR)); + tmp = calloc(1, (len + 1) * sizeof(WCHAR)); if (!tmp) { midl_user_free(value); @@ -2365,7 +2364,7 @@ UINT WINAPI MsiGetPropertyW(MSIHANDLE hinst, const WCHAR *name, WCHAR *buf, DWOR r = msi_strncpyW(tmp, len, buf, sz); - heap_free(tmp); + free(tmp); } midl_user_free(value); return r; diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 1ef99c2ab05..8f6986039a9 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -57,7 +57,8 @@ static BOOL streams_resize_table( MSIDATABASE *db, UINT size ) { MSISTREAM *tmp; UINT new_size = db->num_streams_allocated * 2; - if (!(tmp = msi_realloc_zero( db->streams, new_size * sizeof(MSISTREAM) ))) return FALSE; + if (!(tmp = msi_realloc( db->streams, new_size * sizeof(*tmp) ))) return FALSE; + memset( tmp + db->num_streams_allocated, 0, (new_size - db->num_streams_allocated) * sizeof(*tmp) ); db->streams = tmp; db->num_streams_allocated = new_size; } diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 0e250ff4527..fb0134810b9 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -139,13 +139,11 @@ static int st_find_free_entry( string_table *st ) return i; /* dynamically resize */ - sz = st->maxcount + 1 + st->maxcount/2; - p = msi_realloc_zero( st->strings, sz * sizeof(struct msistring) ); - if( !p ) - return -1; + sz = st->maxcount + 1 + st->maxcount / 2; + if (!(p = msi_realloc( st->strings, sz * sizeof(*p) ))) return -1; + memset( p + st->maxcount, 0, (sz - st->maxcount) * sizeof(*p) ); - s = msi_realloc( st->sorted, sz*sizeof(UINT) ); - if( !s ) + if (!(s = msi_realloc( st->sorted, sz * sizeof(*s) ))) { msi_free( p ); return -1; diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 2a64de8cd9d..684d9d5fb98 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -131,9 +131,10 @@ static UINT add_row(MSIWHEREVIEW *wv, UINT vals[]) MSIROWENTRY **new_reorder; UINT newsize = wv->reorder_size * 2; - new_reorder = msi_realloc_zero(wv->reorder, sizeof(MSIROWENTRY *) * newsize); + new_reorder = msi_realloc(wv->reorder, newsize * sizeof(*new_reorder)); if (!new_reorder) return ERROR_OUTOFMEMORY; + memset(new_reorder + wv->reorder_size, 0, (newsize - wv->reorder_size) * sizeof(*new_reorder)); wv->reorder = new_reorder; wv->reorder_size = newsize; -- 2.30.2

1 0