- wine-devel - winehq.org

hnetcfg: return S_OK in get_StaticPortMappingCollection
by Vijay Kiran Kamuju 10 Oct '20

10 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49449 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] gdiplus: Fix texture brush rotation anomaly.
by Haoyang Chen 10 Oct '20

10 Oct '20

2 1

Wine staging 5.19 release
by Alistair Leslie-Hughes 09 Oct '20

09 Oct '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.19 (662 patches are applied to wine vanilla) NOTE: Currently the esync patchset has been disabled until it can be rebased. Upstreamed (Either directly from staging or fixed with a similar patch). * d3dx9_36: No need to fail if we don't support vertices reordering in D3DXMESHOPT_ATTRSORT * winegstreamer: Add a GstPad wrapping the media source's bytestream. * winegstreamer: Implement IMFMediaStream::GetStreamDescriptor. * gdi32: Perform lazy initialization of fonts to improve startup performance. * ws2_32: Fix handling of empty string in WS_getaddrinfo. Added: * [46534] windows.networking.connectivity: New DLL Updated: * ntdll-Junction_Points * mfplat-streaming-support * xactengine-initial * bcrypt-ECDHSecretAgreement * server-Object_Types * xactengine2-dll * ntdll-ForceBottomUpAlloc * color-sRGB-profile Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 8/8] windowscodecs: Add a general wrapper around the decoder interface.
by Esme Povirk 09 Oct '20

09 Oct '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/decoder.c | 746 +++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 810 +------------------------ dlls/windowscodecs/wincodecs_private.h | 3 + 4 files changed, 765 insertions(+), 795 deletions(-) create mode 100644 dlls/windowscodecs/decoder.c diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index fde28aea778..2472ef57d63 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ colortransform.c \ converter.c \ ddsformat.c \ + decoder.c \ fliprotate.c \ gifformat.c \ icnsformat.c \ diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c new file mode 100644 index 00000000000..599b5780e8f --- /dev/null +++ b/dlls/windowscodecs/decoder.c @@ -0,0 +1,746 @@ +/* + * 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#define NONAMELESSUNION +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct { + IWICBitmapDecoder IWICBitmapDecoder_iface; + LONG ref; + CRITICAL_SECTION lock; /* must be held when stream or decoder is accessed */ + IStream *stream; + struct decoder *decoder; + struct decoder_info decoder_info; + struct decoder_stat file_info; + WICDecodeOptions cache_options; +} CommonDecoder; + +static inline CommonDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) +{ + return CONTAINING_RECORD(iface, CommonDecoder, IWICBitmapDecoder_iface); +} + +static HRESULT WINAPI CommonDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, + void **ppv) +{ + CommonDecoder *This = impl_from_IWICBitmapDecoder(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapDecoder, iid)) + { + *ppv = &This->IWICBitmapDecoder_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI CommonDecoder_AddRef(IWICBitmapDecoder *iface) +{ + CommonDecoder *This = impl_from_IWICBitmapDecoder(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI CommonDecoder_Release(IWICBitmapDecoder *iface) +{ + CommonDecoder *This = impl_from_IWICBitmapDecoder(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + if (This->stream) + IStream_Release(This->stream); + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI CommonDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream, + DWORD *capability) +{ + CommonDecoder *This = impl_from_IWICBitmapDecoder(iface); + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, stream, capability); + + if (!stream || !capability) return E_INVALIDARG; + + hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand); + if (hr != S_OK) return hr; + + *capability = (This->file_info.flags & DECODER_FLAGS_CAPABILITY_MASK); + return S_OK; +} + +static HRESULT WINAPI CommonDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, + WICDecodeOptions cacheOptions) +{ + CommonDecoder *This = impl_from_IWICBitmapDecoder(iface); + HRESULT hr=S_OK; + + TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); + + EnterCriticalSection(&This->lock); + + if (This->stream) + hr = WINCODEC_ERR_WRONGSTATE; + + if (SUCCEEDED(hr)) + hr = decoder_initialize(This->decoder, pIStream, &This->file_info); + + if (SUCCEEDED(hr)) + { + This->cache_options = cacheOptions; + This->stream = pIStream; + IStream_AddRef(This->stream); + } + + LeaveCriticalSection(&This->lock); + + return hr; +} + +static HRESULT WINAPI CommonDecoder_GetContainerFormat(IWICBitmapDecoder *iface, + GUID *pguidContainerFormat) +{ + CommonDecoder *This = impl_from_IWICBitmapDecoder(iface); + memcpy(pguidContainerFormat, &This->decoder_info.container_format, sizeof(GUID)); + return S_OK; +} + +static HRESULT WINAPI CommonDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, + IWICBitmapDecoderInfo **ppIDecoderInfo) +{ + CommonDecoder *This = impl_from_IWICBitmapDecoder(iface); + TRACE("(%p,%p)\n", iface, ppIDecoderInfo); + + return get_decoder_info(&This->decoder_info.clsid, ppIDecoderInfo); +} + +static HRESULT WINAPI CommonDecoder_CopyPalette(IWICBitmapDecoder *iface, + IWICPalette *palette) +{ + TRACE("(%p,%p)\n", iface, palette); + return WINCODEC_ERR_PALETTEUNAVAILABLE; +} + +static HRESULT WINAPI CommonDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, + IWICMetadataQueryReader **reader) +{ + TRACE("(%p,%p)\n", iface, reader); + + if (!reader) return E_INVALIDARG; + + *reader = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI CommonDecoder_GetPreview(IWICBitmapDecoder *iface, + IWICBitmapSource **ppIBitmapSource) +{ + TRACE("(%p,%p)\n", iface, ppIBitmapSource); + + if (!ppIBitmapSource) return E_INVALIDARG; + + *ppIBitmapSource = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI CommonDecoder_GetColorContexts(IWICBitmapDecoder *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI CommonDecoder_GetThumbnail(IWICBitmapDecoder *iface, + IWICBitmapSource **ppIThumbnail) +{ + TRACE("(%p,%p)\n", iface, ppIThumbnail); + + if (!ppIThumbnail) return E_INVALIDARG; + + *ppIThumbnail = NULL; + return WINCODEC_ERR_CODECNOTHUMBNAIL; +} + +static HRESULT WINAPI CommonDecoder_GetFrameCount(IWICBitmapDecoder *iface, + UINT *pCount) +{ + CommonDecoder *This = impl_from_IWICBitmapDecoder(iface); + if (!pCount) return E_INVALIDARG; + + if (!This->stream) return WINCODEC_ERR_WRONGSTATE; + + *pCount = This->file_info.frame_count; + return S_OK; +} + +static HRESULT WINAPI CommonDecoder_GetFrame(IWICBitmapDecoder *iface, + UINT index, IWICBitmapFrameDecode **ppIBitmapFrame); + +static const IWICBitmapDecoderVtbl CommonDecoder_Vtbl = { + CommonDecoder_QueryInterface, + CommonDecoder_AddRef, + CommonDecoder_Release, + CommonDecoder_QueryCapability, + CommonDecoder_Initialize, + CommonDecoder_GetContainerFormat, + CommonDecoder_GetDecoderInfo, + CommonDecoder_CopyPalette, + CommonDecoder_GetMetadataQueryReader, + CommonDecoder_GetPreview, + CommonDecoder_GetColorContexts, + CommonDecoder_GetThumbnail, + CommonDecoder_GetFrameCount, + CommonDecoder_GetFrame +}; + +typedef struct { + IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; + IWICMetadataBlockReader IWICMetadataBlockReader_iface; + LONG ref; + CommonDecoder *parent; + DWORD frame; + struct decoder_frame decoder_frame; + BOOL metadata_initialized; + ULONG metadata_count; + struct decoder_block* metadata_blocks; +} CommonDecoderFrame; + +static inline CommonDecoderFrame *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDecode *iface) +{ + return CONTAINING_RECORD(iface, CommonDecoderFrame, IWICBitmapFrameDecode_iface); +} + +static inline CommonDecoderFrame *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) +{ + return CONTAINING_RECORD(iface, CommonDecoderFrame, IWICMetadataBlockReader_iface); +} + +static HRESULT WINAPI CommonDecoderFrame_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, + void **ppv) +{ + CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) + { + *ppv = &This->IWICBitmapFrameDecode_iface; + } + else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid) && + (This->parent->file_info.flags & WICBitmapDecoderCapabilityCanEnumerateMetadata)) + { + *ppv = &This->IWICMetadataBlockReader_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI CommonDecoderFrame_AddRef(IWICBitmapFrameDecode *iface) +{ + CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI CommonDecoderFrame_Release(IWICBitmapFrameDecode *iface) +{ + CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + IWICBitmapDecoder_Release(&This->parent->IWICBitmapDecoder_iface); + HeapFree(GetProcessHeap(), 0, This->metadata_blocks); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI CommonDecoderFrame_GetSize(IWICBitmapFrameDecode *iface, + UINT *puiWidth, UINT *puiHeight) +{ + CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); + + TRACE("(%p,%p,%p)\n", This, puiWidth, puiHeight); + + if (!puiWidth || !puiHeight) + return E_POINTER; + + *puiWidth = This->decoder_frame.width; + *puiHeight = This->decoder_frame.height; + return S_OK; +} + +static HRESULT WINAPI CommonDecoderFrame_GetPixelFormat(IWICBitmapFrameDecode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); + + TRACE("(%p,%p)\n", This, pPixelFormat); + + if (!pPixelFormat) + return E_POINTER; + + *pPixelFormat = This->decoder_frame.pixel_format; + return S_OK; +} + +static HRESULT WINAPI CommonDecoderFrame_GetResolution(IWICBitmapFrameDecode *iface, + double *pDpiX, double *pDpiY) +{ + CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); + + TRACE("(%p,%p,%p)\n", This, pDpiX, pDpiY); + + if (!pDpiX || !pDpiY) + return E_POINTER; + + *pDpiX = This->decoder_frame.dpix; + *pDpiY = This->decoder_frame.dpiy; + return S_OK; +} + +static HRESULT WINAPI CommonDecoderFrame_CopyPalette(IWICBitmapFrameDecode *iface, + IWICPalette *pIPalette) +{ + CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); + HRESULT hr=S_OK; + + TRACE("(%p,%p)\n", iface, pIPalette); + + if (This->decoder_frame.num_colors) + { + hr = IWICPalette_InitializeCustom(pIPalette, This->decoder_frame.palette, This->decoder_frame.num_colors); + } + else + { + hr = WINCODEC_ERR_PALETTEUNAVAILABLE; + } + + return hr; +} + +static HRESULT WINAPI CommonDecoderFrame_CopyPixels(IWICBitmapFrameDecode *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); + HRESULT hr; + UINT bytesperrow; + WICRect rect; + + TRACE("(%p,%s,%u,%u,%p)\n", iface, debug_wic_rect(prc), cbStride, cbBufferSize, pbBuffer); + + if (!pbBuffer) + return E_POINTER; + + if (!prc) + { + rect.X = 0; + rect.Y = 0; + rect.Width = This->decoder_frame.width; + rect.Height = This->decoder_frame.height; + prc = &rect; + } + else + { + if (prc->X < 0 || prc->Y < 0 || + prc->X+prc->Width > This->decoder_frame.width || + prc->Y+prc->Height > This->decoder_frame.height) + return E_INVALIDARG; + } + + bytesperrow = ((This->decoder_frame.bpp * prc->Width)+7)/8; + + if (cbStride < bytesperrow) + return E_INVALIDARG; + + if ((cbStride * (prc->Height-1)) + bytesperrow > cbBufferSize) + return E_INVALIDARG; + + EnterCriticalSection(&This->parent->lock); + + hr = decoder_copy_pixels(This->parent->decoder, This->frame, + prc, cbStride, cbBufferSize, pbBuffer); + + LeaveCriticalSection(&This->parent->lock); + + return hr; +} + +static HRESULT WINAPI CommonDecoderFrame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); + + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); + + if (!ppIMetadataQueryReader) + return E_INVALIDARG; + + if (!(This->parent->file_info.flags & WICBitmapDecoderCapabilityCanEnumerateMetadata)) + return WINCODEC_ERR_UNSUPPORTEDOPERATION; + + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); +} + +static HRESULT WINAPI CommonDecoderFrame_GetColorContexts(IWICBitmapFrameDecode *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); + HRESULT hr=S_OK; + UINT i; + BYTE *profile; + DWORD profile_len; + + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + + if (!pcActualCount) return E_INVALIDARG; + + *pcActualCount = This->decoder_frame.num_color_contexts; + + if (This->decoder_frame.num_color_contexts && cCount && ppIColorContexts) + { + if (cCount >= This->decoder_frame.num_color_contexts) + { + EnterCriticalSection(&This->parent->lock); + + for (i=0; i<This->decoder_frame.num_color_contexts; i++) + { + hr = decoder_get_color_context(This->parent->decoder, This->frame, i, + &profile, &profile_len); + if (SUCCEEDED(hr)) + { + hr = IWICColorContext_InitializeFromMemory(ppIColorContexts[i], profile, profile_len); + + HeapFree(GetProcessHeap(), 0, profile); + } + + if (FAILED(hr)) + break; + } + + LeaveCriticalSection(&This->parent->lock); + } + else + { + hr = E_INVALIDARG; + } + } + + return hr; +} + +static HRESULT WINAPI CommonDecoderFrame_GetThumbnail(IWICBitmapFrameDecode *iface, + IWICBitmapSource **ppIThumbnail) +{ + TRACE("(%p,%p)\n", iface, ppIThumbnail); + + if (!ppIThumbnail) return E_INVALIDARG; + + *ppIThumbnail = NULL; + return WINCODEC_ERR_CODECNOTHUMBNAIL; +} + +static const IWICBitmapFrameDecodeVtbl CommonDecoderFrameVtbl = { + CommonDecoderFrame_QueryInterface, + CommonDecoderFrame_AddRef, + CommonDecoderFrame_Release, + CommonDecoderFrame_GetSize, + CommonDecoderFrame_GetPixelFormat, + CommonDecoderFrame_GetResolution, + CommonDecoderFrame_CopyPalette, + CommonDecoderFrame_CopyPixels, + CommonDecoderFrame_GetMetadataQueryReader, + CommonDecoderFrame_GetColorContexts, + CommonDecoderFrame_GetThumbnail +}; + +static HRESULT WINAPI CommonDecoderFrame_Block_QueryInterface(IWICMetadataBlockReader *iface, REFIID iid, + void **ppv) +{ + CommonDecoderFrame *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_QueryInterface(&This->IWICBitmapFrameDecode_iface, iid, ppv); +} + +static ULONG WINAPI CommonDecoderFrame_Block_AddRef(IWICMetadataBlockReader *iface) +{ + CommonDecoderFrame *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_AddRef(&This->IWICBitmapFrameDecode_iface); +} + +static ULONG WINAPI CommonDecoderFrame_Block_Release(IWICMetadataBlockReader *iface) +{ + CommonDecoderFrame *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_Release(&This->IWICBitmapFrameDecode_iface); +} + +static HRESULT WINAPI CommonDecoderFrame_Block_GetContainerFormat(IWICMetadataBlockReader *iface, + GUID *pguidContainerFormat) +{ + CommonDecoderFrame *This = impl_from_IWICMetadataBlockReader(iface); + if (!pguidContainerFormat) return E_INVALIDARG; + *pguidContainerFormat = This->parent->decoder_info.block_format; + return S_OK; +} + +static HRESULT WINAPI CommonDecoderFrame_InitializeMetadata(CommonDecoderFrame *This) +{ + HRESULT hr=S_OK; + + if (This->metadata_initialized) + return S_OK; + + EnterCriticalSection(&This->parent->lock); + + if (!This->metadata_initialized) + { + hr = decoder_get_metadata_blocks(This->parent->decoder, This->frame, &This->metadata_count, &This->metadata_blocks); + if (SUCCEEDED(hr)) + This->metadata_initialized = TRUE; + } + + LeaveCriticalSection(&This->parent->lock); + + return hr; +} + +static HRESULT WINAPI CommonDecoderFrame_Block_GetCount(IWICMetadataBlockReader *iface, + UINT *pcCount) +{ + CommonDecoderFrame *This = impl_from_IWICMetadataBlockReader(iface); + HRESULT hr; + + TRACE("%p,%p\n", iface, pcCount); + + if (!pcCount) return E_INVALIDARG; + + hr = CommonDecoderFrame_InitializeMetadata(This); + if (SUCCEEDED(hr)) + *pcCount = This->metadata_count; + + return hr; +} + +static HRESULT WINAPI CommonDecoderFrame_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, + UINT nIndex, IWICMetadataReader **ppIMetadataReader) +{ + CommonDecoderFrame *This = impl_from_IWICMetadataBlockReader(iface); + HRESULT hr; + IWICComponentFactory* factory; + IWICStream* stream; + + TRACE("%p,%d,%p\n", iface, nIndex, ppIMetadataReader); + + if (!ppIMetadataReader) + return E_INVALIDARG; + + hr = CommonDecoderFrame_InitializeMetadata(This); + + if (SUCCEEDED(hr) && nIndex >= This->metadata_count) + hr = E_INVALIDARG; + + if (SUCCEEDED(hr)) + hr = StreamImpl_Create(&stream); + + if (SUCCEEDED(hr)) + { + ULARGE_INTEGER offset, length; + + offset.QuadPart = This->metadata_blocks[nIndex].offset; + length.QuadPart = This->metadata_blocks[nIndex].length; + hr = IWICStream_InitializeFromIStreamRegion(stream, This->parent->stream, + offset, length); + + if (SUCCEEDED(hr)) + hr = ImagingFactory_CreateInstance(&IID_IWICComponentFactory, (void**)&factory); + + if (SUCCEEDED(hr)) + { + hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, + &This->parent->decoder_info.block_format, NULL, This->metadata_blocks[nIndex].options, + (IStream*)stream, ppIMetadataReader); + + IWICComponentFactory_Release(factory); + } + + IWICStream_Release(stream); + } + + if (FAILED(hr)) + *ppIMetadataReader = NULL; + + return S_OK; +} + +static HRESULT WINAPI CommonDecoderFrame_Block_GetEnumerator(IWICMetadataBlockReader *iface, + IEnumUnknown **ppIEnumMetadata) +{ + FIXME("%p,%p\n", iface, ppIEnumMetadata); + return E_NOTIMPL; +} + +static const IWICMetadataBlockReaderVtbl CommonDecoderFrame_BlockVtbl = { + CommonDecoderFrame_Block_QueryInterface, + CommonDecoderFrame_Block_AddRef, + CommonDecoderFrame_Block_Release, + CommonDecoderFrame_Block_GetContainerFormat, + CommonDecoderFrame_Block_GetCount, + CommonDecoderFrame_Block_GetReaderByIndex, + CommonDecoderFrame_Block_GetEnumerator, +}; + +static HRESULT WINAPI CommonDecoder_GetFrame(IWICBitmapDecoder *iface, + UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) +{ + CommonDecoder *This = impl_from_IWICBitmapDecoder(iface); + HRESULT hr=S_OK; + CommonDecoderFrame *result; + + TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); + + if (!ppIBitmapFrame) + return E_POINTER; + + EnterCriticalSection(&This->lock); + + if (!This->stream || index >= This->file_info.frame_count) + hr = WINCODEC_ERR_FRAMEMISSING; + + if (SUCCEEDED(hr)) + { + result = HeapAlloc(GetProcessHeap(), 0, sizeof(*result)); + if (!result) + hr = E_OUTOFMEMORY; + } + + if (SUCCEEDED(hr)) + { + result->IWICBitmapFrameDecode_iface.lpVtbl = &CommonDecoderFrameVtbl; + result->IWICMetadataBlockReader_iface.lpVtbl = &CommonDecoderFrame_BlockVtbl; + result->ref = 1; + result->parent = This; + result->frame = index; + result->metadata_initialized = FALSE; + result->metadata_count = 0; + result->metadata_blocks = NULL; + + hr = decoder_get_frame_info(This->decoder, index, &result->decoder_frame); + + if (SUCCEEDED(hr) && This->cache_options == WICDecodeMetadataCacheOnLoad) + hr = CommonDecoderFrame_InitializeMetadata(result); + + if (FAILED(hr)) + HeapFree(GetProcessHeap(), 0, result); + } + + LeaveCriticalSection(&This->lock); + + if (SUCCEEDED(hr)) + { + TRACE("-> %ux%u, %u-bit pixelformat=%s res=%f,%f colors=%u contexts=%u\n", + result->decoder_frame.width, result->decoder_frame.height, + result->decoder_frame.bpp, wine_dbgstr_guid(&result->decoder_frame.pixel_format), + result->decoder_frame.dpix, result->decoder_frame.dpiy, + result->decoder_frame.num_colors, result->decoder_frame.num_color_contexts); + IWICBitmapDecoder_AddRef(&This->IWICBitmapDecoder_iface); + *ppIBitmapFrame = &result->IWICBitmapFrameDecode_iface; + } + else + { + *ppIBitmapFrame = NULL; + } + + return hr; +} + +HRESULT CommonDecoder_CreateInstance(struct decoder *decoder, + const struct decoder_info *decoder_info, REFIID iid, void** ppv) +{ + CommonDecoder *This; + HRESULT hr; + + TRACE("(%s,%s,%p)\n", debugstr_guid(&decoder_info->clsid), debugstr_guid(iid), ppv); + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + { + decoder_destroy(decoder); + return E_OUTOFMEMORY; + } + + This->IWICBitmapDecoder_iface.lpVtbl = &CommonDecoder_Vtbl; + This->ref = 1; + This->stream = NULL; + This->decoder = decoder; + This->decoder_info = *decoder_info; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CommonDecoder.lock"); + + hr = IWICBitmapDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv); + IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); + + return hr; +} + diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index efd5f6ab2c1..b36512447b2 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -392,795 +392,6 @@ static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message WARN("PNG warning: %s\n", debugstr_a(warning_message)); } -typedef struct { - ULARGE_INTEGER ofs, len; - IWICMetadataReader* reader; -} metadata_block_info; - -typedef struct { - IWICBitmapDecoder IWICBitmapDecoder_iface; - IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; - IWICMetadataBlockReader IWICMetadataBlockReader_iface; - LONG ref; - IStream *stream; - struct decoder *png_decoder; - struct decoder_info decoder_info; - struct decoder_stat file_info; - struct decoder_frame decoder_frame; - png_structp png_ptr; - png_infop info_ptr; - png_infop end_info; - BOOL initialized; - int bpp; - int width, height; - UINT stride; - const WICPixelFormatGUID *format; - BYTE *image_bits; - CRITICAL_SECTION lock; /* must be held when png structures are accessed or initialized is set */ - ULONG metadata_count; - struct decoder_block* metadata_blocks; -} PngDecoder; - -static inline PngDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) -{ - return CONTAINING_RECORD(iface, PngDecoder, IWICBitmapDecoder_iface); -} - -static inline PngDecoder *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDecode *iface) -{ - return CONTAINING_RECORD(iface, PngDecoder, IWICBitmapFrameDecode_iface); -} - -static inline PngDecoder *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) -{ - return CONTAINING_RECORD(iface, PngDecoder, IWICMetadataBlockReader_iface); -} - -static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl; - -static HRESULT WINAPI PngDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, - void **ppv) -{ - PngDecoder *This = impl_from_IWICBitmapDecoder(iface); - TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); - - if (!ppv) return E_INVALIDARG; - - if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapDecoder, iid)) - { - *ppv = &This->IWICBitmapDecoder_iface; - } - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI PngDecoder_AddRef(IWICBitmapDecoder *iface) -{ - PngDecoder *This = impl_from_IWICBitmapDecoder(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) refcount=%u\n", iface, ref); - - return ref; -} - -static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) -{ - PngDecoder *This = impl_from_IWICBitmapDecoder(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) refcount=%u\n", iface, ref); - - if (ref == 0) - { - if (This->stream) - IStream_Release(This->stream); - if (This->png_ptr) - ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); - if (This->png_decoder) - decoder_destroy(This->png_decoder); - This->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->lock); - HeapFree(GetProcessHeap(), 0, This->image_bits); - HeapFree(GetProcessHeap(), 0, This->metadata_blocks); - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI PngDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream, - DWORD *capability) -{ - PngDecoder *This = impl_from_IWICBitmapDecoder(iface); - HRESULT hr; - - TRACE("(%p,%p,%p)\n", iface, stream, capability); - - if (!stream || !capability) return E_INVALIDARG; - - hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand); - if (hr != S_OK) return hr; - - *capability = (This->file_info.flags & DECODER_FLAGS_CAPABILITY_MASK); - return S_OK; -} - -static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) -{ - IStream *stream = ppng_get_io_ptr(png_ptr); - HRESULT hr; - ULONG bytesread; - - hr = IStream_Read(stream, data, length, &bytesread); - if (FAILED(hr) || bytesread != length) - { - ppng_error(png_ptr, "failed reading data"); - } -} - -static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, - WICDecodeOptions cacheOptions) -{ - PngDecoder *This = impl_from_IWICBitmapDecoder(iface); - LARGE_INTEGER seek; - HRESULT hr=S_OK; - png_bytep *row_pointers=NULL; - UINT image_size; - UINT i; - int color_type, bit_depth; - png_bytep trans; - int num_trans; - png_uint_32 transparency; - png_color_16p trans_values; - jmp_buf jmpbuf; - - TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); - - EnterCriticalSection(&This->lock); - - if (This->initialized) - { - hr = WINCODEC_ERR_WRONGSTATE; - goto end; - } - - hr = decoder_initialize(This->png_decoder, pIStream, &This->file_info); - if (FAILED(hr)) - goto end; - - /* this function cannot fail in PNG decoder */ - decoder_get_frame_info(This->png_decoder, 0, &This->decoder_frame); - - /* initialize libpng */ - This->png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (!This->png_ptr) - { - hr = E_FAIL; - goto end; - } - - This->info_ptr = ppng_create_info_struct(This->png_ptr); - if (!This->info_ptr) - { - ppng_destroy_read_struct(&This->png_ptr, NULL, NULL); - This->png_ptr = NULL; - hr = E_FAIL; - goto end; - } - - This->end_info = ppng_create_info_struct(This->png_ptr); - if (!This->end_info) - { - ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, NULL); - This->png_ptr = NULL; - hr = E_FAIL; - goto end; - } - - /* set up setjmp/longjmp error handling */ - if (setjmp(jmpbuf)) - { - ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); - This->png_ptr = NULL; - hr = WINCODEC_ERR_UNKNOWNIMAGEFORMAT; - goto end; - } - ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); - ppng_set_crc_action(This->png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE); - - /* seek to the start of the stream */ - seek.QuadPart = 0; - hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) goto end; - - /* set up custom i/o handling */ - ppng_set_read_fn(This->png_ptr, pIStream, user_read_data); - - /* read the header */ - ppng_read_info(This->png_ptr, This->info_ptr); - - /* choose a pixel format */ - color_type = ppng_get_color_type(This->png_ptr, This->info_ptr); - bit_depth = ppng_get_bit_depth(This->png_ptr, This->info_ptr); - - /* PNGs with bit-depth greater than 8 are network byte order. Windows does not expect this. */ - if (bit_depth > 8) - ppng_set_swap(This->png_ptr); - - /* check for color-keyed alpha */ - transparency = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); - - if (transparency && (color_type == PNG_COLOR_TYPE_RGB || - (color_type == PNG_COLOR_TYPE_GRAY && bit_depth == 16))) - { - /* expand to RGBA */ - if (color_type == PNG_COLOR_TYPE_GRAY) - ppng_set_gray_to_rgb(This->png_ptr); - ppng_set_tRNS_to_alpha(This->png_ptr); - color_type = PNG_COLOR_TYPE_RGB_ALPHA; - } - - switch (color_type) - { - case PNG_COLOR_TYPE_GRAY_ALPHA: - /* WIC does not support grayscale alpha formats so use RGBA */ - ppng_set_gray_to_rgb(This->png_ptr); - /* fall through */ - case PNG_COLOR_TYPE_RGB_ALPHA: - This->bpp = bit_depth * 4; - switch (bit_depth) - { - case 8: - ppng_set_bgr(This->png_ptr); - This->format = &GUID_WICPixelFormat32bppBGRA; - break; - case 16: This->format = &GUID_WICPixelFormat64bppRGBA; break; - default: - ERR("invalid RGBA bit depth: %i\n", bit_depth); - hr = E_FAIL; - goto end; - } - break; - case PNG_COLOR_TYPE_GRAY: - This->bpp = bit_depth; - if (!transparency) - { - switch (bit_depth) - { - case 1: This->format = &GUID_WICPixelFormatBlackWhite; break; - case 2: This->format = &GUID_WICPixelFormat2bppGray; break; - case 4: This->format = &GUID_WICPixelFormat4bppGray; break; - case 8: This->format = &GUID_WICPixelFormat8bppGray; break; - case 16: This->format = &GUID_WICPixelFormat16bppGray; break; - default: - ERR("invalid grayscale bit depth: %i\n", bit_depth); - hr = E_FAIL; - goto end; - } - break; - } - /* else fall through */ - case PNG_COLOR_TYPE_PALETTE: - This->bpp = bit_depth; - switch (bit_depth) - { - case 1: This->format = &GUID_WICPixelFormat1bppIndexed; break; - case 2: This->format = &GUID_WICPixelFormat2bppIndexed; break; - case 4: This->format = &GUID_WICPixelFormat4bppIndexed; break; - case 8: This->format = &GUID_WICPixelFormat8bppIndexed; break; - default: - ERR("invalid indexed color bit depth: %i\n", bit_depth); - hr = E_FAIL; - goto end; - } - break; - case PNG_COLOR_TYPE_RGB: - This->bpp = bit_depth * 3; - switch (bit_depth) - { - case 8: - ppng_set_bgr(This->png_ptr); - This->format = &GUID_WICPixelFormat24bppBGR; - break; - case 16: This->format = &GUID_WICPixelFormat48bppRGB; break; - default: - ERR("invalid RGB color bit depth: %i\n", bit_depth); - hr = E_FAIL; - goto end; - } - break; - default: - ERR("invalid color type %i\n", color_type); - hr = E_FAIL; - goto end; - } - - /* read the image data */ - This->width = ppng_get_image_width(This->png_ptr, This->info_ptr); - This->height = ppng_get_image_height(This->png_ptr, This->info_ptr); - This->stride = (This->width * This->bpp + 7) / 8; - image_size = This->stride * This->height; - - This->image_bits = HeapAlloc(GetProcessHeap(), 0, image_size); - if (!This->image_bits) - { - hr = E_OUTOFMEMORY; - goto end; - } - - row_pointers = HeapAlloc(GetProcessHeap(), 0, sizeof(png_bytep)*This->height); - if (!row_pointers) - { - hr = E_OUTOFMEMORY; - goto end; - } - - for (i=0; i<This->height; i++) - row_pointers[i] = This->image_bits + i * This->stride; - - ppng_read_image(This->png_ptr, row_pointers); - - HeapFree(GetProcessHeap(), 0, row_pointers); - row_pointers = NULL; - - ppng_read_end(This->png_ptr, This->end_info); - - decoder_get_metadata_blocks(This->png_decoder, 0, &This->metadata_count, &This->metadata_blocks); - - This->stream = pIStream; - IStream_AddRef(This->stream); - - This->initialized = TRUE; - -end: - LeaveCriticalSection(&This->lock); - - HeapFree(GetProcessHeap(), 0, row_pointers); - - return hr; -} - -static HRESULT WINAPI PngDecoder_GetContainerFormat(IWICBitmapDecoder *iface, - GUID *pguidContainerFormat) -{ - PngDecoder *This = impl_from_IWICBitmapDecoder(iface); - memcpy(pguidContainerFormat, &This->decoder_info.container_format, sizeof(GUID)); - return S_OK; -} - -static HRESULT WINAPI PngDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, - IWICBitmapDecoderInfo **ppIDecoderInfo) -{ - PngDecoder *This = impl_from_IWICBitmapDecoder(iface); - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - - return get_decoder_info(&This->decoder_info.clsid, ppIDecoderInfo); -} - -static HRESULT WINAPI PngDecoder_CopyPalette(IWICBitmapDecoder *iface, - IWICPalette *palette) -{ - TRACE("(%p,%p)\n", iface, palette); - return WINCODEC_ERR_PALETTEUNAVAILABLE; -} - -static HRESULT WINAPI PngDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, - IWICMetadataQueryReader **reader) -{ - TRACE("(%p,%p)\n", iface, reader); - - if (!reader) return E_INVALIDARG; - - *reader = NULL; - return WINCODEC_ERR_UNSUPPORTEDOPERATION; -} - -static HRESULT WINAPI PngDecoder_GetPreview(IWICBitmapDecoder *iface, - IWICBitmapSource **ppIBitmapSource) -{ - TRACE("(%p,%p)\n", iface, ppIBitmapSource); - - if (!ppIBitmapSource) return E_INVALIDARG; - - *ppIBitmapSource = NULL; - return WINCODEC_ERR_UNSUPPORTEDOPERATION; -} - -static HRESULT WINAPI PngDecoder_GetColorContexts(IWICBitmapDecoder *iface, - UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) -{ - TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; -} - -static HRESULT WINAPI PngDecoder_GetThumbnail(IWICBitmapDecoder *iface, - IWICBitmapSource **ppIThumbnail) -{ - TRACE("(%p,%p)\n", iface, ppIThumbnail); - - if (!ppIThumbnail) return E_INVALIDARG; - - *ppIThumbnail = NULL; - return WINCODEC_ERR_CODECNOTHUMBNAIL; -} - -static HRESULT WINAPI PngDecoder_GetFrameCount(IWICBitmapDecoder *iface, - UINT *pCount) -{ - PngDecoder *This = impl_from_IWICBitmapDecoder(iface); - if (!pCount) return E_INVALIDARG; - - if (!This->initialized) return WINCODEC_ERR_WRONGSTATE; - - *pCount = This->file_info.frame_count; - return S_OK; -} - -static HRESULT WINAPI PngDecoder_GetFrame(IWICBitmapDecoder *iface, - UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) -{ - PngDecoder *This = impl_from_IWICBitmapDecoder(iface); - TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); - - if (!This->initialized) return WINCODEC_ERR_FRAMEMISSING; - - if (index != 0) return E_INVALIDARG; - - IWICBitmapDecoder_AddRef(iface); - - *ppIBitmapFrame = &This->IWICBitmapFrameDecode_iface; - - return S_OK; -} - -static const IWICBitmapDecoderVtbl PngDecoder_Vtbl = { - PngDecoder_QueryInterface, - PngDecoder_AddRef, - PngDecoder_Release, - PngDecoder_QueryCapability, - PngDecoder_Initialize, - PngDecoder_GetContainerFormat, - PngDecoder_GetDecoderInfo, - PngDecoder_CopyPalette, - PngDecoder_GetMetadataQueryReader, - PngDecoder_GetPreview, - PngDecoder_GetColorContexts, - PngDecoder_GetThumbnail, - PngDecoder_GetFrameCount, - PngDecoder_GetFrame -}; - -static HRESULT WINAPI PngDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, - void **ppv) -{ - PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - if (!ppv) return E_INVALIDARG; - - if (IsEqualIID(&IID_IUnknown, iid) || - IsEqualIID(&IID_IWICBitmapSource, iid) || - IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) - { - *ppv = &This->IWICBitmapFrameDecode_iface; - } - else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid)) - { - *ppv = &This->IWICMetadataBlockReader_iface; - } - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI PngDecoder_Frame_AddRef(IWICBitmapFrameDecode *iface) -{ - PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - return IWICBitmapDecoder_AddRef(&This->IWICBitmapDecoder_iface); -} - -static ULONG WINAPI PngDecoder_Frame_Release(IWICBitmapFrameDecode *iface) -{ - PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - return IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); -} - -static HRESULT WINAPI PngDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, - UINT *puiWidth, UINT *puiHeight) -{ - PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - *puiWidth = This->decoder_frame.width; - *puiHeight = This->decoder_frame.height; - TRACE("(%p)->(%u,%u)\n", iface, *puiWidth, *puiHeight); - return S_OK; -} - -static HRESULT WINAPI PngDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface, - WICPixelFormatGUID *pPixelFormat) -{ - PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - TRACE("(%p,%p)\n", iface, pPixelFormat); - - memcpy(pPixelFormat, &This->decoder_frame.pixel_format, sizeof(GUID)); - - return S_OK; -} - -static HRESULT WINAPI PngDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface, - double *pDpiX, double *pDpiY) -{ - PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - - *pDpiX = This->decoder_frame.dpix; - *pDpiY = This->decoder_frame.dpiy; - - TRACE("(%p)->(%0.2f,%0.2f)\n", iface, *pDpiX, *pDpiY); - - return S_OK; -} - -static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, - IWICPalette *pIPalette) -{ - PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - HRESULT hr=S_OK; - - TRACE("(%p,%p)\n", iface, pIPalette); - - if (This->decoder_frame.num_colors) - { - hr = IWICPalette_InitializeCustom(pIPalette, This->decoder_frame.palette, This->decoder_frame.num_colors); - } - else - { - hr = WINCODEC_ERR_PALETTEUNAVAILABLE; - } - - return hr; -} - -static HRESULT WINAPI PngDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, - const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) -{ - PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - TRACE("(%p,%s,%u,%u,%p)\n", iface, debug_wic_rect(prc), cbStride, cbBufferSize, pbBuffer); - - return decoder_copy_pixels(This->png_decoder, 0, - prc, cbStride, cbBufferSize, pbBuffer); -} - -static HRESULT WINAPI PngDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, - IWICMetadataQueryReader **ppIMetadataQueryReader) -{ - PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - - TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); - - if (!ppIMetadataQueryReader) - return E_INVALIDARG; - - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); -} - -static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, - UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) -{ - PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - HRESULT hr=S_OK; - BYTE *profile; - DWORD profile_len; - - TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); - - if (!pcActualCount) return E_INVALIDARG; - - *pcActualCount = This->decoder_frame.num_color_contexts; - - if (This->decoder_frame.num_color_contexts && cCount && ppIColorContexts) - { - EnterCriticalSection(&This->lock); - - hr = decoder_get_color_context(This->png_decoder, 0, 0, - &profile, &profile_len); - - LeaveCriticalSection(&This->lock); - - if (SUCCEEDED(hr)) - { - hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, profile_len); - - HeapFree(GetProcessHeap(), 0, profile); - } - } - - return hr; -} - -static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, - IWICBitmapSource **ppIThumbnail) -{ - TRACE("(%p,%p)\n", iface, ppIThumbnail); - - if (!ppIThumbnail) return E_INVALIDARG; - - *ppIThumbnail = NULL; - return WINCODEC_ERR_CODECNOTHUMBNAIL; -} - -static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl = { - PngDecoder_Frame_QueryInterface, - PngDecoder_Frame_AddRef, - PngDecoder_Frame_Release, - PngDecoder_Frame_GetSize, - PngDecoder_Frame_GetPixelFormat, - PngDecoder_Frame_GetResolution, - PngDecoder_Frame_CopyPalette, - PngDecoder_Frame_CopyPixels, - PngDecoder_Frame_GetMetadataQueryReader, - PngDecoder_Frame_GetColorContexts, - PngDecoder_Frame_GetThumbnail -}; - -static HRESULT WINAPI PngDecoder_Block_QueryInterface(IWICMetadataBlockReader *iface, REFIID iid, - void **ppv) -{ - PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); - return IWICBitmapFrameDecode_QueryInterface(&This->IWICBitmapFrameDecode_iface, iid, ppv); -} - -static ULONG WINAPI PngDecoder_Block_AddRef(IWICMetadataBlockReader *iface) -{ - PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); - return IWICBitmapDecoder_AddRef(&This->IWICBitmapDecoder_iface); -} - -static ULONG WINAPI PngDecoder_Block_Release(IWICMetadataBlockReader *iface) -{ - PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); - return IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); -} - -static HRESULT WINAPI PngDecoder_Block_GetContainerFormat(IWICMetadataBlockReader *iface, - GUID *pguidContainerFormat) -{ - PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); - if (!pguidContainerFormat) return E_INVALIDARG; - memcpy(pguidContainerFormat, &This->decoder_info.block_format, sizeof(GUID)); - return S_OK; -} - -static HRESULT WINAPI PngDecoder_Block_GetCount(IWICMetadataBlockReader *iface, - UINT *pcCount) -{ - PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); - - TRACE("%p,%p\n", iface, pcCount); - - if (!pcCount) return E_INVALIDARG; - - *pcCount = This->metadata_count; - - return S_OK; -} - -static HRESULT WINAPI PngDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, - UINT nIndex, IWICMetadataReader **ppIMetadataReader) -{ - PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); - HRESULT hr; - IWICComponentFactory* factory; - IWICStream* stream; - - TRACE("%p,%d,%p\n", iface, nIndex, ppIMetadataReader); - - if (nIndex >= This->metadata_count || !ppIMetadataReader) - return E_INVALIDARG; - - hr = StreamImpl_Create(&stream); - - if (SUCCEEDED(hr)) - { - ULARGE_INTEGER offset, length; - - offset.QuadPart = This->metadata_blocks[nIndex].offset; - length.QuadPart = This->metadata_blocks[nIndex].length; - hr = IWICStream_InitializeFromIStreamRegion(stream, This->stream, - offset, length); - - if (SUCCEEDED(hr)) - hr = ImagingFactory_CreateInstance(&IID_IWICComponentFactory, (void**)&factory); - - if (SUCCEEDED(hr)) - { - hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, - &GUID_ContainerFormatPng, NULL, This->metadata_blocks[nIndex].options, - (IStream*)stream, ppIMetadataReader); - - IWICComponentFactory_Release(factory); - } - - IWICStream_Release(stream); - } - - if (FAILED(hr)) - *ppIMetadataReader = NULL; - - return S_OK; -} - -static HRESULT WINAPI PngDecoder_Block_GetEnumerator(IWICMetadataBlockReader *iface, - IEnumUnknown **ppIEnumMetadata) -{ - FIXME("%p,%p\n", iface, ppIEnumMetadata); - return E_NOTIMPL; -} - -static const IWICMetadataBlockReaderVtbl PngDecoder_BlockVtbl = { - PngDecoder_Block_QueryInterface, - PngDecoder_Block_AddRef, - PngDecoder_Block_Release, - PngDecoder_Block_GetContainerFormat, - PngDecoder_Block_GetCount, - PngDecoder_Block_GetReaderByIndex, - PngDecoder_Block_GetEnumerator, -}; - -HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv) -{ - PngDecoder *This; - HRESULT ret; - - TRACE("(%s,%p)\n", debugstr_guid(iid), ppv); - - *ppv = NULL; - - if (!load_libpng()) - { - ERR("Failed reading PNG because unable to find %s\n",SONAME_LIBPNG); - return E_FAIL; - } - - This = HeapAlloc(GetProcessHeap(), 0, sizeof(PngDecoder)); - if (!This) return E_OUTOFMEMORY; - - ret = get_unix_decoder(&CLSID_WICPngDecoder, &This->decoder_info, &This->png_decoder); - if (FAILED(ret)) - { - HeapFree(GetProcessHeap(), 0, This); - return ret; - } - - This->IWICBitmapDecoder_iface.lpVtbl = &PngDecoder_Vtbl; - This->IWICBitmapFrameDecode_iface.lpVtbl = &PngDecoder_FrameVtbl; - This->IWICMetadataBlockReader_iface.lpVtbl = &PngDecoder_BlockVtbl; - This->ref = 1; - This->png_ptr = NULL; - This->info_ptr = NULL; - This->end_info = NULL; - This->stream = NULL; - This->initialized = FALSE; - This->image_bits = NULL; - InitializeCriticalSection(&This->lock); - This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PngDecoder.lock"); - This->metadata_count = 0; - This->metadata_blocks = NULL; - - ret = IWICBitmapDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv); - IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); - - return ret; -} - struct png_pixelformat { const WICPixelFormatGUID *guid; UINT bpp; @@ -2034,12 +1245,6 @@ HRESULT PngEncoder_CreateInstance(REFIID iid, void** ppv) #else /* !SONAME_LIBPNG */ -HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv) -{ - ERR("Trying to load PNG picture, but PNG support is not compiled in.\n"); - return E_FAIL; -} - HRESULT PngEncoder_CreateInstance(REFIID iid, void** ppv) { ERR("Trying to save PNG picture, but PNG support is not compiled in.\n"); @@ -2047,3 +1252,18 @@ HRESULT PngEncoder_CreateInstance(REFIID iid, void** ppv) } #endif + +HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv) +{ + HRESULT hr; + struct decoder *decoder; + struct decoder_info decoder_info; + + hr = get_unix_decoder(&CLSID_WICPngDecoder, &decoder_info, &decoder); + + if (SUCCEEDED(hr)) + hr = CommonDecoder_CreateInstance(decoder, &decoder_info, iid, ppv); + + return hr; +} + diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index e5294b8cf1a..2cdd1066eb7 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -343,4 +343,7 @@ struct unix_funcs HRESULT get_unix_decoder(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); +extern HRESULT CommonDecoder_CreateInstance(struct decoder *decoder, + const struct decoder_info *decoder_info, REFIID iid, void** ppv) DECLSPEC_HIDDEN; + #endif /* WINCODECS_PRIVATE_H */ -- 2.17.1

1 0

[PATCH 7/8] windowscodecs: Do not call png_read_end.
by Esme Povirk 09 Oct '20

09 Oct '20

This isn't necessary because we do not use libpng to read metadata or verify checksums. If this happens to be the last thing we do, it will fail the pngformat tests which do not expect us to return with the stream seeked to the end of the file. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/libpng.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 36151e94f1b..f101935211c 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -61,7 +61,6 @@ MAKE_FUNCPTR(png_get_io_ptr); MAKE_FUNCPTR(png_get_pHYs); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); -MAKE_FUNCPTR(png_read_end); MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); MAKE_FUNCPTR(png_set_bgr); @@ -111,7 +110,6 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_pHYs); LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); - LOAD_FUNCPTR(png_read_end); LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); LOAD_FUNCPTR(png_set_bgr); @@ -183,7 +181,6 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str struct png_decoder *This = impl_from_decoder(iface); png_structp png_ptr; png_infop info_ptr; - png_infop end_info; jmp_buf jmpbuf; HRESULT hr = E_FAIL; int color_type, bit_depth; @@ -216,13 +213,6 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str return E_FAIL; } - end_info = ppng_create_info_struct(png_ptr); - if (!end_info) - { - ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return E_FAIL; - } - /* set up setjmp/longjmp error handling */ if (setjmp(jmpbuf)) { @@ -443,7 +433,7 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str free(row_pointers); row_pointers = NULL; - ppng_read_end(png_ptr, end_info); + /* png_read_end intentionally not called to not seek to the end of the file */ st->flags = WICBitmapDecoderCapabilityCanDecodeAllImages | WICBitmapDecoderCapabilityCanDecodeSomeImages | @@ -455,7 +445,7 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str hr = S_OK; end: - ppng_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); free(row_pointers); if (FAILED(hr)) { -- 2.17.1

1 0

[PATCH 6/8] windowscodecs: Use unix lib to get PNG color contexts.
by Esme Povirk 09 Oct '20

09 Oct '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/libpng.c | 45 ++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 35 +++++++++----------- dlls/windowscodecs/unix_iface.c | 8 +++++ dlls/windowscodecs/unix_lib.c | 1 + dlls/windowscodecs/wincodecs_common.h | 6 ++++ dlls/windowscodecs/wincodecs_private.h | 7 ++++ 6 files changed, 83 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 8a4db91f2a9..36151e94f1b 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -54,6 +54,7 @@ MAKE_FUNCPTR(png_error); MAKE_FUNCPTR(png_get_bit_depth); MAKE_FUNCPTR(png_get_color_type); MAKE_FUNCPTR(png_get_error_ptr); +MAKE_FUNCPTR(png_get_iCCP); MAKE_FUNCPTR(png_get_image_height); MAKE_FUNCPTR(png_get_image_width); MAKE_FUNCPTR(png_get_io_ptr); @@ -105,6 +106,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_error_ptr); LOAD_FUNCPTR(png_get_image_height); LOAD_FUNCPTR(png_get_image_width); + LOAD_FUNCPTR(png_get_iCCP); LOAD_FUNCPTR(png_get_io_ptr); LOAD_FUNCPTR(png_get_pHYs); LOAD_FUNCPTR(png_get_PLTE); @@ -137,6 +139,8 @@ struct png_decoder struct decoder_frame decoder_frame; UINT stride; BYTE *image_bits; + BYTE *color_profile; + DWORD color_profile_len; }; static inline struct png_decoder *impl_from_decoder(struct decoder* iface) @@ -194,6 +198,10 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str int i; UINT image_size; png_bytep *row_pointers=NULL; + png_charp cp_name; + png_bytep cp_profile; + png_uint_32 cp_len; + int cp_compression; png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (!png_ptr) @@ -351,6 +359,22 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str This->decoder_frame.dpix = This->decoder_frame.dpiy = 96.0; } + ret = ppng_get_iCCP(png_ptr, info_ptr, &cp_name, &cp_compression, &cp_profile, &cp_len); + if (ret) + { + This->decoder_frame.num_color_contexts = 1; + This->color_profile_len = cp_len; + This->color_profile = malloc(cp_len); + if (!This->color_profile) + { + hr = E_OUTOFMEMORY; + goto end; + } + memcpy(This->color_profile, cp_profile, cp_len); + } + else + This->decoder_frame.num_color_contexts = 0; + if (color_type == PNG_COLOR_TYPE_PALETTE) { ret = ppng_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette); @@ -437,6 +461,8 @@ end: { free(This->image_bits); This->image_bits = NULL; + free(This->color_profile); + This->color_profile = NULL; } return hr; } @@ -531,11 +557,28 @@ end: return hr; } +HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, + BYTE **data, DWORD *datasize) +{ + struct png_decoder *This = impl_from_decoder(iface); + + *data = RtlAllocateHeap(GetProcessHeap(), 0, This->color_profile_len); + *datasize = This->color_profile_len; + + if (!*data) + return E_OUTOFMEMORY; + + memcpy(*data, This->color_profile, This->color_profile_len); + + return S_OK; +} + void CDECL png_decoder_destroy(struct decoder* iface) { struct png_decoder *This = impl_from_decoder(iface); free(This->image_bits); + free(This->color_profile); RtlFreeHeap(GetProcessHeap(), 0, This); } @@ -544,6 +587,7 @@ static const struct decoder_funcs png_decoder_vtable = { png_decoder_get_frame_info, png_decoder_copy_pixels, png_decoder_get_metadata_blocks, + png_decoder_get_color_context, png_decoder_destroy }; @@ -566,6 +610,7 @@ HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **res This->decoder.vtable = &png_decoder_vtable; This->image_bits = NULL; + This->color_profile = NULL; *result = &This->decoder; info->container_format = GUID_ContainerFormatPng; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 1d696a4fe01..efd5f6ab2c1 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -976,37 +976,34 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - png_charp name; + HRESULT hr=S_OK; BYTE *profile; - png_uint_32 len; - int compression_type; - HRESULT hr; + DWORD profile_len; TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); if (!pcActualCount) return E_INVALIDARG; - EnterCriticalSection(&This->lock); + *pcActualCount = This->decoder_frame.num_color_contexts; - if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, (void *)&profile, &len)) + if (This->decoder_frame.num_color_contexts && cCount && ppIColorContexts) { - if (cCount && ppIColorContexts) + EnterCriticalSection(&This->lock); + + hr = decoder_get_color_context(This->png_decoder, 0, 0, + &profile, &profile_len); + + LeaveCriticalSection(&This->lock); + + if (SUCCEEDED(hr)) { - hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, len); - if (FAILED(hr)) - { - LeaveCriticalSection(&This->lock); - return hr; - } + hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, profile_len); + + HeapFree(GetProcessHeap(), 0, profile); } - *pcActualCount = 1; } - else - *pcActualCount = 0; - LeaveCriticalSection(&This->lock); - - return S_OK; + return hr; } static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/unix_iface.c b/dlls/windowscodecs/unix_iface.c index 8d22b49ba22..cdc92a7d160 100644 --- a/dlls/windowscodecs/unix_iface.c +++ b/dlls/windowscodecs/unix_iface.c @@ -92,6 +92,13 @@ HRESULT CDECL decoder_wrapper_get_metadata_blocks(struct decoder* iface, return unix_funcs->decoder_get_metadata_blocks(This->unix_decoder, frame, count, blocks); } +HRESULT CDECL decoder_wrapper_get_color_context(struct decoder* iface, + UINT frame, UINT num, BYTE **data, DWORD *datasize) +{ + struct decoder_wrapper* This = impl_from_decoder(iface); + return unix_funcs->decoder_get_color_context(This->unix_decoder, frame, num, data, datasize); +} + void CDECL decoder_wrapper_destroy(struct decoder* iface) { struct decoder_wrapper* This = impl_from_decoder(iface); @@ -104,6 +111,7 @@ static const struct decoder_funcs decoder_wrapper_vtable = { decoder_wrapper_get_frame_info, decoder_wrapper_copy_pixels, decoder_wrapper_get_metadata_blocks, + decoder_wrapper_get_color_context, decoder_wrapper_destroy }; diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index 58c68018430..217a5a2e63a 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -71,6 +71,7 @@ static const struct unix_funcs unix_funcs = { decoder_get_frame_info, decoder_copy_pixels, decoder_get_metadata_blocks, + decoder_get_color_context, decoder_destroy }; diff --git a/dlls/windowscodecs/wincodecs_common.h b/dlls/windowscodecs/wincodecs_common.h index 5489a055a27..b5d7b645638 100644 --- a/dlls/windowscodecs/wincodecs_common.h +++ b/dlls/windowscodecs/wincodecs_common.h @@ -37,6 +37,12 @@ HRESULT CDECL decoder_get_metadata_blocks(struct decoder *decoder, UINT frame, U return decoder->vtable->get_metadata_blocks(decoder, frame, count, blocks); } +HRESULT CDECL decoder_get_color_context(struct decoder *decoder, UINT frame, + UINT num, BYTE **data, DWORD *datasize) +{ + return decoder->vtable->get_color_context(decoder, frame, num, data, datasize); +} + void CDECL decoder_destroy(struct decoder *decoder) { decoder->vtable->destroy(decoder); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 3c0b73e893f..e5294b8cf1a 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -275,6 +275,7 @@ struct decoder_frame UINT width, height; UINT bpp; double dpix, dpiy; + DWORD num_color_contexts; DWORD num_colors; WICColor palette[256]; }; @@ -299,6 +300,8 @@ struct decoder_funcs UINT stride, UINT buffersize, BYTE *buffer); HRESULT (CDECL *get_metadata_blocks)(struct decoder* This, UINT frame, UINT *count, struct decoder_block **blocks); + HRESULT (CDECL *get_color_context)(struct decoder* This, UINT frame, UINT num, + BYTE **data, DWORD *datasize); void (CDECL *destroy)(struct decoder* This); }; @@ -318,6 +321,8 @@ HRESULT CDECL decoder_copy_pixels(struct decoder* This, UINT frame, const WICRec UINT stride, UINT buffersize, BYTE *buffer); HRESULT CDECL decoder_get_metadata_blocks(struct decoder* This, UINT frame, UINT *count, struct decoder_block **blocks); +HRESULT CDECL decoder_get_color_context(struct decoder* This, UINT frame, UINT num, + BYTE **data, DWORD *datasize); void CDECL decoder_destroy(struct decoder *This); HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result); @@ -331,6 +336,8 @@ struct unix_funcs UINT stride, UINT buffersize, BYTE *buffer); HRESULT (CDECL *decoder_get_metadata_blocks)(struct decoder* This, UINT frame, UINT *count, struct decoder_block **blocks); + HRESULT (CDECL *decoder_get_color_context)(struct decoder* This, UINT frame, UINT num, + BYTE **data, DWORD *datasize); void (CDECL *decoder_destroy)(struct decoder* This); }; -- 2.17.1

1 0

[PATCH 5/8] windowscodecs: Use the unix library to find PNG metadata.
by Esme Povirk 09 Oct '20

09 Oct '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/libpng.c | 77 +++++++++++++ dlls/windowscodecs/main.c | 1 + dlls/windowscodecs/pngformat.c | 143 ++++--------------------- dlls/windowscodecs/unix_iface.c | 8 ++ dlls/windowscodecs/unix_lib.c | 1 + dlls/windowscodecs/wincodecs_common.h | 51 +++++++++ dlls/windowscodecs/wincodecs_private.h | 15 +++ 7 files changed, 174 insertions(+), 122 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 397d2d371ef..8a4db91f2a9 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -133,6 +133,7 @@ static void *load_libpng(void) struct png_decoder { struct decoder decoder; + IStream *stream; struct decoder_frame decoder_frame; UINT stride; BYTE *image_bits; @@ -425,6 +426,8 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str WICBitmapDecoderCapabilityCanEnumerateMetadata; st->frame_count = 1; + This->stream = stream; + hr = S_OK; end: @@ -455,6 +458,79 @@ HRESULT CDECL png_decoder_copy_pixels(struct decoder *iface, UINT frame, prc, stride, buffersize, buffer); } +HRESULT CDECL png_decoder_get_metadata_blocks(struct decoder* iface, + UINT frame, UINT *count, struct decoder_block **blocks) +{ + struct png_decoder *This = impl_from_decoder(iface); + HRESULT hr; + struct decoder_block *result = NULL; + ULONGLONG seek; + BYTE chunk_type[4]; + ULONG chunk_size; + ULONGLONG chunk_start; + ULONG metadata_blocks_size = 0; + + seek = 8; + *count = 0; + + do + { + hr = stream_seek(This->stream, seek, STREAM_SEEK_SET, &chunk_start); + if (FAILED(hr)) goto end; + + hr = read_png_chunk(This->stream, chunk_type, NULL, &chunk_size); + if (FAILED(hr)) goto end; + + if (chunk_type[0] >= 'a' && chunk_type[0] <= 'z' && + memcmp(chunk_type, "tRNS", 4) && memcmp(chunk_type, "pHYs", 4)) + { + /* This chunk is considered metadata. */ + if (*count == metadata_blocks_size) + { + struct decoder_block *new_metadata_blocks; + ULONG new_metadata_blocks_size; + + new_metadata_blocks_size = 4 + metadata_blocks_size * 2; + new_metadata_blocks = RtlAllocateHeap(GetProcessHeap(), 0, + new_metadata_blocks_size * sizeof(*new_metadata_blocks)); + + if (!new_metadata_blocks) + { + hr = E_OUTOFMEMORY; + goto end; + } + + memcpy(new_metadata_blocks, result, + *count * sizeof(*new_metadata_blocks)); + + RtlFreeHeap(GetProcessHeap(), 0, result); + result = new_metadata_blocks; + metadata_blocks_size = new_metadata_blocks_size; + } + + result[*count].offset = chunk_start; + result[*count].length = chunk_size + 12; + result[*count].options = WICMetadataCreationAllowUnknown; + (*count)++; + } + + seek = chunk_start + chunk_size + 12; /* skip data and CRC */ + } while (memcmp(chunk_type, "IEND", 4)); + +end: + if (SUCCEEDED(hr)) + { + *blocks = result; + } + else + { + *count = 0; + *blocks = NULL; + RtlFreeHeap(GetProcessHeap(), 0, result); + } + return hr; +} + void CDECL png_decoder_destroy(struct decoder* iface) { struct png_decoder *This = impl_from_decoder(iface); @@ -467,6 +543,7 @@ static const struct decoder_funcs png_decoder_vtable = { png_decoder_initialize, png_decoder_get_frame_info, png_decoder_copy_pixels, + png_decoder_get_metadata_blocks, png_decoder_destroy }; diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 982c8ddfada..4dcc146d6c8 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "objbase.h" #include "wincodecs_private.h" diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 834cc81d306..1d696a4fe01 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -44,47 +44,6 @@ static inline ULONG read_ulong_be(BYTE* data) return data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3]; } -static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size) -{ - BYTE header[8]; - HRESULT hr; - ULONG bytesread; - - hr = IStream_Read(stream, header, 8, &bytesread); - if (FAILED(hr) || bytesread < 8) - { - if (SUCCEEDED(hr)) - hr = E_FAIL; - return hr; - } - - *data_size = read_ulong_be(&header[0]); - - memcpy(type, &header[4], 4); - - if (data) - { - *data = HeapAlloc(GetProcessHeap(), 0, *data_size); - if (!*data) - return E_OUTOFMEMORY; - - hr = IStream_Read(stream, *data, *data_size, &bytesread); - - if (FAILED(hr) || bytesread < *data_size) - { - if (SUCCEEDED(hr)) - hr = E_FAIL; - HeapFree(GetProcessHeap(), 0, *data); - *data = NULL; - return hr; - } - - /* Windows ignores CRC of the chunk */ - } - - return S_OK; -} - static HRESULT LoadTextMetadata(IStream *stream, const GUID *preferred_vendor, DWORD persist_options, MetadataItem **items, DWORD *item_count) { @@ -459,7 +418,7 @@ typedef struct { BYTE *image_bits; CRITICAL_SECTION lock; /* must be held when png structures are accessed or initialized is set */ ULONG metadata_count; - metadata_block_info* metadata_blocks; + struct decoder_block* metadata_blocks; } PngDecoder; static inline PngDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) @@ -515,7 +474,6 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) { PngDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedDecrement(&This->ref); - ULONG i; TRACE("(%p) refcount=%u\n", iface, ref); @@ -530,11 +488,6 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This->image_bits); - for (i=0; i<This->metadata_count; i++) - { - if (This->metadata_blocks[i].reader) - IWICMetadataReader_Release(This->metadata_blocks[i].reader); - } HeapFree(GetProcessHeap(), 0, This->metadata_blocks); HeapFree(GetProcessHeap(), 0, This); } @@ -587,10 +540,6 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p png_uint_32 transparency; png_color_16p trans_values; jmp_buf jmpbuf; - BYTE chunk_type[4]; - ULONG chunk_size; - ULARGE_INTEGER chunk_start; - ULONG metadata_blocks_size = 0; TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); @@ -783,52 +732,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p ppng_read_end(This->png_ptr, This->end_info); - /* Find the metadata chunks in the file. */ - seek.QuadPart = 8; - - do - { - hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, &chunk_start); - if (FAILED(hr)) goto end; - - hr = read_png_chunk(pIStream, chunk_type, NULL, &chunk_size); - if (FAILED(hr)) goto end; - - if (chunk_type[0] >= 'a' && chunk_type[0] <= 'z' && - memcmp(chunk_type, "tRNS", 4) && memcmp(chunk_type, "pHYs", 4)) - { - /* This chunk is considered metadata. */ - if (This->metadata_count == metadata_blocks_size) - { - metadata_block_info* new_metadata_blocks; - ULONG new_metadata_blocks_size; - - new_metadata_blocks_size = 4 + metadata_blocks_size * 2; - new_metadata_blocks = HeapAlloc(GetProcessHeap(), 0, - new_metadata_blocks_size * sizeof(*new_metadata_blocks)); - - if (!new_metadata_blocks) - { - hr = E_OUTOFMEMORY; - goto end; - } - - memcpy(new_metadata_blocks, This->metadata_blocks, - This->metadata_count * sizeof(*new_metadata_blocks)); - - HeapFree(GetProcessHeap(), 0, This->metadata_blocks); - This->metadata_blocks = new_metadata_blocks; - metadata_blocks_size = new_metadata_blocks_size; - } - - This->metadata_blocks[This->metadata_count].ofs = chunk_start; - This->metadata_blocks[This->metadata_count].len.QuadPart = chunk_size + 12; - This->metadata_blocks[This->metadata_count].reader = NULL; - This->metadata_count++; - } - - seek.QuadPart = chunk_start.QuadPart + chunk_size + 12; /* skip data and CRC */ - } while (memcmp(chunk_type, "IEND", 4)); + decoder_get_metadata_blocks(This->png_decoder, 0, &This->metadata_count, &This->metadata_blocks); This->stream = pIStream; IStream_AddRef(This->stream); @@ -1185,39 +1089,34 @@ static HRESULT WINAPI PngDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader if (nIndex >= This->metadata_count || !ppIMetadataReader) return E_INVALIDARG; - if (!This->metadata_blocks[nIndex].reader) - { - hr = StreamImpl_Create(&stream); + hr = StreamImpl_Create(&stream); - if (SUCCEEDED(hr)) - { - hr = IWICStream_InitializeFromIStreamRegion(stream, This->stream, - This->metadata_blocks[nIndex].ofs, This->metadata_blocks[nIndex].len); + if (SUCCEEDED(hr)) + { + ULARGE_INTEGER offset, length; - if (SUCCEEDED(hr)) - hr = ImagingFactory_CreateInstance(&IID_IWICComponentFactory, (void**)&factory); + offset.QuadPart = This->metadata_blocks[nIndex].offset; + length.QuadPart = This->metadata_blocks[nIndex].length; + hr = IWICStream_InitializeFromIStreamRegion(stream, This->stream, + offset, length); - if (SUCCEEDED(hr)) - { - hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, - &GUID_ContainerFormatPng, NULL, WICMetadataCreationAllowUnknown, - (IStream*)stream, &This->metadata_blocks[nIndex].reader); + if (SUCCEEDED(hr)) + hr = ImagingFactory_CreateInstance(&IID_IWICComponentFactory, (void**)&factory); - IWICComponentFactory_Release(factory); - } + if (SUCCEEDED(hr)) + { + hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, + &GUID_ContainerFormatPng, NULL, This->metadata_blocks[nIndex].options, + (IStream*)stream, ppIMetadataReader); - IWICStream_Release(stream); + IWICComponentFactory_Release(factory); } - if (FAILED(hr)) - { - *ppIMetadataReader = NULL; - return hr; - } + IWICStream_Release(stream); } - *ppIMetadataReader = This->metadata_blocks[nIndex].reader; - IWICMetadataReader_AddRef(*ppIMetadataReader); + if (FAILED(hr)) + *ppIMetadataReader = NULL; return S_OK; } diff --git a/dlls/windowscodecs/unix_iface.c b/dlls/windowscodecs/unix_iface.c index 46bcacff941..8d22b49ba22 100644 --- a/dlls/windowscodecs/unix_iface.c +++ b/dlls/windowscodecs/unix_iface.c @@ -85,6 +85,13 @@ HRESULT CDECL decoder_wrapper_copy_pixels(struct decoder* iface, UINT frame, return unix_funcs->decoder_copy_pixels(This->unix_decoder, frame, prc, stride, buffersize, buffer); } +HRESULT CDECL decoder_wrapper_get_metadata_blocks(struct decoder* iface, + UINT frame, UINT *count, struct decoder_block **blocks) +{ + struct decoder_wrapper* This = impl_from_decoder(iface); + return unix_funcs->decoder_get_metadata_blocks(This->unix_decoder, frame, count, blocks); +} + void CDECL decoder_wrapper_destroy(struct decoder* iface) { struct decoder_wrapper* This = impl_from_decoder(iface); @@ -96,6 +103,7 @@ static const struct decoder_funcs decoder_wrapper_vtable = { decoder_wrapper_initialize, decoder_wrapper_get_frame_info, decoder_wrapper_copy_pixels, + decoder_wrapper_get_metadata_blocks, decoder_wrapper_destroy }; diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index 5ab1cb342e6..58c68018430 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -70,6 +70,7 @@ static const struct unix_funcs unix_funcs = { decoder_initialize, decoder_get_frame_info, decoder_copy_pixels, + decoder_get_metadata_blocks, decoder_destroy }; diff --git a/dlls/windowscodecs/wincodecs_common.h b/dlls/windowscodecs/wincodecs_common.h index f116fb6fd8f..5489a055a27 100644 --- a/dlls/windowscodecs/wincodecs_common.h +++ b/dlls/windowscodecs/wincodecs_common.h @@ -32,6 +32,11 @@ HRESULT CDECL decoder_copy_pixels(struct decoder *decoder, UINT frame, return decoder->vtable->copy_pixels(decoder, frame, prc, stride, buffersize, buffer); } +HRESULT CDECL decoder_get_metadata_blocks(struct decoder *decoder, UINT frame, UINT *count, struct decoder_block **blocks) +{ + return decoder->vtable->get_metadata_blocks(decoder, frame, count, blocks); +} + void CDECL decoder_destroy(struct decoder *decoder) { decoder->vtable->destroy(decoder); @@ -102,3 +107,49 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, } } +static inline ULONG read_ulong_be(BYTE* data) +{ + return data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3]; +} + +HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size) +{ + BYTE header[8]; + HRESULT hr; + ULONG bytesread; + + hr = stream_read(stream, header, 8, &bytesread); + if (FAILED(hr) || bytesread < 8) + { + if (SUCCEEDED(hr)) + hr = E_FAIL; + return hr; + } + + *data_size = read_ulong_be(&header[0]); + + memcpy(type, &header[4], 4); + + if (data) + { + *data = RtlAllocateHeap(GetProcessHeap(), 0, *data_size); + if (!*data) + return E_OUTOFMEMORY; + + hr = stream_read(stream, *data, *data_size, &bytesread); + + if (FAILED(hr) || bytesread < *data_size) + { + if (SUCCEEDED(hr)) + hr = E_FAIL; + RtlFreeHeap(GetProcessHeap(), 0, *data); + *data = NULL; + return hr; + } + + /* Windows ignores CRC of the chunk */ + } + + return S_OK; +} + diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 24cae3652f4..3c0b73e893f 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -249,6 +249,8 @@ static inline const char *debug_wic_rect(const WICRect *rect) HMODULE windowscodecs_module; +HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size); + /* unixlib iface */ struct decoder_funcs; @@ -277,6 +279,13 @@ struct decoder_frame WICColor palette[256]; }; +struct decoder_block +{ + ULONGLONG offset; + ULONGLONG length; + DWORD options; +}; + struct decoder { const struct decoder_funcs *vtable; @@ -288,6 +297,8 @@ struct decoder_funcs HRESULT (CDECL *get_frame_info)(struct decoder* This, UINT frame, struct decoder_frame *info); HRESULT (CDECL *copy_pixels)(struct decoder* This, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer); + HRESULT (CDECL *get_metadata_blocks)(struct decoder* This, UINT frame, UINT *count, + struct decoder_block **blocks); void (CDECL *destroy)(struct decoder* This); }; @@ -305,6 +316,8 @@ HRESULT CDECL decoder_initialize(struct decoder *This, IStream *stream, struct d HRESULT CDECL decoder_get_frame_info(struct decoder* This, UINT frame, struct decoder_frame *info); HRESULT CDECL decoder_copy_pixels(struct decoder* This, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer); +HRESULT CDECL decoder_get_metadata_blocks(struct decoder* This, UINT frame, UINT *count, + struct decoder_block **blocks); void CDECL decoder_destroy(struct decoder *This); HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result); @@ -316,6 +329,8 @@ struct unix_funcs HRESULT (CDECL *decoder_get_frame_info)(struct decoder* This, UINT frame, struct decoder_frame *info); HRESULT (CDECL *decoder_copy_pixels)(struct decoder* This, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer); + HRESULT (CDECL *decoder_get_metadata_blocks)(struct decoder* This, UINT frame, UINT *count, + struct decoder_block **blocks); void (CDECL *decoder_destroy)(struct decoder* This); }; -- 2.17.1

1 0

[PATCH 4/8] windowscodecs: Move PNG CopyPixels to unix lib.
by Esme Povirk 09 Oct '20

09 Oct '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/libpng.c | 54 ++++++++++++++++++++ dlls/windowscodecs/main.c | 65 ----------------------- dlls/windowscodecs/pngformat.c | 3 +- dlls/windowscodecs/unix_iface.c | 8 +++ dlls/windowscodecs/unix_lib.c | 3 ++ dlls/windowscodecs/wincodecs_common.h | 71 ++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 6 +++ 7 files changed, 143 insertions(+), 67 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index bed7ea72d65..397d2d371ef 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -60,6 +60,8 @@ MAKE_FUNCPTR(png_get_io_ptr); MAKE_FUNCPTR(png_get_pHYs); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); +MAKE_FUNCPTR(png_read_end); +MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); MAKE_FUNCPTR(png_set_bgr); MAKE_FUNCPTR(png_set_crc_action); @@ -107,6 +109,8 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_pHYs); LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); + LOAD_FUNCPTR(png_read_end); + LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); LOAD_FUNCPTR(png_set_bgr); LOAD_FUNCPTR(png_set_crc_action); @@ -130,6 +134,8 @@ struct png_decoder { struct decoder decoder; struct decoder_frame decoder_frame; + UINT stride; + BYTE *image_bits; }; static inline struct png_decoder *impl_from_decoder(struct decoder* iface) @@ -185,6 +191,8 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str png_colorp png_palette; int num_palette; int i; + UINT image_size; + png_bytep *row_pointers=NULL; png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (!png_ptr) @@ -385,6 +393,33 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str This->decoder_frame.num_colors = 0; } + This->stride = (This->decoder_frame.width * This->decoder_frame.bpp + 7) / 8; + image_size = This->stride * This->decoder_frame.height; + + This->image_bits = malloc(image_size); + if (!This->image_bits) + { + hr = E_OUTOFMEMORY; + goto end; + } + + row_pointers = malloc(sizeof(png_bytep)*This->decoder_frame.height); + if (!row_pointers) + { + hr = E_OUTOFMEMORY; + goto end; + } + + for (i=0; i<This->decoder_frame.height; i++) + row_pointers[i] = This->image_bits + i * This->stride; + + ppng_read_image(png_ptr, row_pointers); + + free(row_pointers); + row_pointers = NULL; + + ppng_read_end(png_ptr, end_info); + st->flags = WICBitmapDecoderCapabilityCanDecodeAllImages | WICBitmapDecoderCapabilityCanDecodeSomeImages | WICBitmapDecoderCapabilityCanEnumerateMetadata; @@ -394,6 +429,12 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str end: ppng_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + free(row_pointers); + if (FAILED(hr)) + { + free(This->image_bits); + This->image_bits = NULL; + } return hr; } @@ -404,16 +445,28 @@ HRESULT CDECL png_decoder_get_frame_info(struct decoder *iface, UINT frame, stru return S_OK; } +HRESULT CDECL png_decoder_copy_pixels(struct decoder *iface, UINT frame, + const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) +{ + struct png_decoder *This = impl_from_decoder(iface); + + return copy_pixels(This->decoder_frame.bpp, This->image_bits, + This->decoder_frame.width, This->decoder_frame.height, This->stride, + prc, stride, buffersize, buffer); +} + void CDECL png_decoder_destroy(struct decoder* iface) { struct png_decoder *This = impl_from_decoder(iface); + free(This->image_bits); RtlFreeHeap(GetProcessHeap(), 0, This); } static const struct decoder_funcs png_decoder_vtable = { png_decoder_initialize, png_decoder_get_frame_info, + png_decoder_copy_pixels, png_decoder_destroy }; @@ -435,6 +488,7 @@ HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **res } This->decoder.vtable = &png_decoder_vtable; + This->image_bits = NULL; *result = &This->decoder; info->container_format = GUID_ContainerFormatPng; diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 2d8b0336f3f..982c8ddfada 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -60,71 +60,6 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } -HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, - UINT srcwidth, UINT srcheight, INT srcstride, - const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer) -{ - UINT bytesperrow; - UINT row_offset; /* number of bits into the source rows where the data starts */ - WICRect rect; - - if (!rc) - { - rect.X = 0; - rect.Y = 0; - rect.Width = srcwidth; - rect.Height = srcheight; - rc = &rect; - } - else - { - if (rc->X < 0 || rc->Y < 0 || rc->X+rc->Width > srcwidth || rc->Y+rc->Height > srcheight) - return E_INVALIDARG; - } - - bytesperrow = ((bpp * rc->Width)+7)/8; - - if (dststride < bytesperrow) - return E_INVALIDARG; - - if ((dststride * (rc->Height-1)) + bytesperrow > dstbuffersize) - return E_INVALIDARG; - - /* if the whole bitmap is copied and the buffer format matches then it's a matter of a single memcpy */ - if (rc->X == 0 && rc->Y == 0 && rc->Width == srcwidth && rc->Height == srcheight && - srcstride == dststride && srcstride == bytesperrow) - { - memcpy(dstbuffer, srcbuffer, srcstride * srcheight); - return S_OK; - } - - row_offset = rc->X * bpp; - - if (row_offset % 8 == 0) - { - /* everything lines up on a byte boundary */ - INT row; - const BYTE *src; - BYTE *dst; - - src = srcbuffer + (row_offset / 8) + srcstride * rc->Y; - dst = dstbuffer; - for (row=0; row < rc->Height; row++) - { - memcpy(dst, src, bytesperrow); - src += srcstride; - dst += dststride; - } - return S_OK; - } - else - { - /* we have to do a weird bitwise copy. eww. */ - FIXME("cannot reliably copy bitmap data if bpp < 8\n"); - return E_FAIL; - } -} - HRESULT configure_write_source(IWICBitmapFrameEncode *iface, IWICBitmapSource *source, const WICRect *prc, const WICPixelFormatGUID *format, diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index d10afcedbc3..834cc81d306 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1051,8 +1051,7 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); TRACE("(%p,%s,%u,%u,%p)\n", iface, debug_wic_rect(prc), cbStride, cbBufferSize, pbBuffer); - return copy_pixels(This->bpp, This->image_bits, - This->width, This->height, This->stride, + return decoder_copy_pixels(This->png_decoder, 0, prc, cbStride, cbBufferSize, pbBuffer); } diff --git a/dlls/windowscodecs/unix_iface.c b/dlls/windowscodecs/unix_iface.c index cf66fbd964d..46bcacff941 100644 --- a/dlls/windowscodecs/unix_iface.c +++ b/dlls/windowscodecs/unix_iface.c @@ -78,6 +78,13 @@ HRESULT CDECL decoder_wrapper_get_frame_info(struct decoder* iface, UINT frame, return unix_funcs->decoder_get_frame_info(This->unix_decoder, frame, info); } +HRESULT CDECL decoder_wrapper_copy_pixels(struct decoder* iface, UINT frame, + const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) +{ + struct decoder_wrapper* This = impl_from_decoder(iface); + return unix_funcs->decoder_copy_pixels(This->unix_decoder, frame, prc, stride, buffersize, buffer); +} + void CDECL decoder_wrapper_destroy(struct decoder* iface) { struct decoder_wrapper* This = impl_from_decoder(iface); @@ -88,6 +95,7 @@ void CDECL decoder_wrapper_destroy(struct decoder* iface) static const struct decoder_funcs decoder_wrapper_vtable = { decoder_wrapper_initialize, decoder_wrapper_get_frame_info, + decoder_wrapper_copy_pixels, decoder_wrapper_destroy }; diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index 111a82dc637..5ab1cb342e6 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -41,6 +41,8 @@ #include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + #include "wincodecs_common.h" static const struct win32_funcs *win32_funcs; @@ -67,6 +69,7 @@ static const struct unix_funcs unix_funcs = { decoder_create, decoder_initialize, decoder_get_frame_info, + decoder_copy_pixels, decoder_destroy }; diff --git a/dlls/windowscodecs/wincodecs_common.h b/dlls/windowscodecs/wincodecs_common.h index ac8ae015c76..f116fb6fd8f 100644 --- a/dlls/windowscodecs/wincodecs_common.h +++ b/dlls/windowscodecs/wincodecs_common.h @@ -26,8 +26,79 @@ HRESULT CDECL decoder_get_frame_info(struct decoder *decoder, UINT frame, struct return decoder->vtable->get_frame_info(decoder, frame, info); } +HRESULT CDECL decoder_copy_pixels(struct decoder *decoder, UINT frame, + const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) +{ + return decoder->vtable->copy_pixels(decoder, frame, prc, stride, buffersize, buffer); +} + void CDECL decoder_destroy(struct decoder *decoder) { decoder->vtable->destroy(decoder); } +HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, + UINT srcwidth, UINT srcheight, INT srcstride, + const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer) +{ + UINT bytesperrow; + UINT row_offset; /* number of bits into the source rows where the data starts */ + WICRect rect; + + if (!rc) + { + rect.X = 0; + rect.Y = 0; + rect.Width = srcwidth; + rect.Height = srcheight; + rc = &rect; + } + else + { + if (rc->X < 0 || rc->Y < 0 || rc->X+rc->Width > srcwidth || rc->Y+rc->Height > srcheight) + return E_INVALIDARG; + } + + bytesperrow = ((bpp * rc->Width)+7)/8; + + if (dststride < bytesperrow) + return E_INVALIDARG; + + if ((dststride * (rc->Height-1)) + bytesperrow > dstbuffersize) + return E_INVALIDARG; + + /* if the whole bitmap is copied and the buffer format matches then it's a matter of a single memcpy */ + if (rc->X == 0 && rc->Y == 0 && rc->Width == srcwidth && rc->Height == srcheight && + srcstride == dststride && srcstride == bytesperrow) + { + memcpy(dstbuffer, srcbuffer, srcstride * srcheight); + return S_OK; + } + + row_offset = rc->X * bpp; + + if (row_offset % 8 == 0) + { + /* everything lines up on a byte boundary */ + INT row; + const BYTE *src; + BYTE *dst; + + src = srcbuffer + (row_offset / 8) + srcstride * rc->Y; + dst = dstbuffer; + for (row=0; row < rc->Height; row++) + { + memcpy(dst, src, bytesperrow); + src += srcstride; + dst += dststride; + } + return S_OK; + } + else + { + /* we have to do a weird bitwise copy. eww. */ + FIXME("cannot reliably copy bitmap data if bpp < 8\n"); + return E_FAIL; + } +} + diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 6d12b98bfc4..24cae3652f4 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -286,6 +286,8 @@ struct decoder_funcs { HRESULT (CDECL *initialize)(struct decoder* This, IStream *stream, struct decoder_stat *st); HRESULT (CDECL *get_frame_info)(struct decoder* This, UINT frame, struct decoder_frame *info); + HRESULT (CDECL *copy_pixels)(struct decoder* This, UINT frame, const WICRect *prc, + UINT stride, UINT buffersize, BYTE *buffer); void (CDECL *destroy)(struct decoder* This); }; @@ -301,6 +303,8 @@ struct win32_funcs HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); HRESULT CDECL decoder_initialize(struct decoder *This, IStream *stream, struct decoder_stat *st); HRESULT CDECL decoder_get_frame_info(struct decoder* This, UINT frame, struct decoder_frame *info); +HRESULT CDECL decoder_copy_pixels(struct decoder* This, UINT frame, const WICRect *prc, + UINT stride, UINT buffersize, BYTE *buffer); void CDECL decoder_destroy(struct decoder *This); HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result); @@ -310,6 +314,8 @@ struct unix_funcs HRESULT (CDECL *decoder_create)(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); HRESULT (CDECL *decoder_initialize)(struct decoder *This, IStream *stream, struct decoder_stat *st); HRESULT (CDECL *decoder_get_frame_info)(struct decoder* This, UINT frame, struct decoder_frame *info); + HRESULT (CDECL *decoder_copy_pixels)(struct decoder* This, UINT frame, const WICRect *prc, + UINT stride, UINT buffersize, BYTE *buffer); void (CDECL *decoder_destroy)(struct decoder* This); }; -- 2.17.1

1 0

[PATCH 3/8] windowscodecs: Get PNG frame information from unix lib.
by Esme Povirk 09 Oct '20

09 Oct '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/libpng.c | 201 +++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 96 ++---------- dlls/windowscodecs/unix_iface.c | 7 + dlls/windowscodecs/unix_lib.c | 1 + dlls/windowscodecs/wincodecs_common.h | 5 + dlls/windowscodecs/wincodecs_private.h | 13 ++ 6 files changed, 238 insertions(+), 85 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index f41ef765f9b..bed7ea72d65 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -1,4 +1,5 @@ /* + * Copyright 2016 Dmitry Timoshkov * Copyright 2020 Esme Povirk * * This library is free software; you can redistribute it and/or @@ -50,12 +51,23 @@ MAKE_FUNCPTR(png_create_info_struct); MAKE_FUNCPTR(png_create_read_struct); MAKE_FUNCPTR(png_destroy_read_struct); MAKE_FUNCPTR(png_error); +MAKE_FUNCPTR(png_get_bit_depth); +MAKE_FUNCPTR(png_get_color_type); MAKE_FUNCPTR(png_get_error_ptr); +MAKE_FUNCPTR(png_get_image_height); +MAKE_FUNCPTR(png_get_image_width); MAKE_FUNCPTR(png_get_io_ptr); +MAKE_FUNCPTR(png_get_pHYs); +MAKE_FUNCPTR(png_get_PLTE); +MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_read_info); +MAKE_FUNCPTR(png_set_bgr); MAKE_FUNCPTR(png_set_crc_action); MAKE_FUNCPTR(png_set_error_fn); +MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_read_fn); +MAKE_FUNCPTR(png_set_swap); +MAKE_FUNCPTR(png_set_tRNS_to_alpha); #undef MAKE_FUNCPTR static CRITICAL_SECTION init_png_cs; @@ -86,12 +98,23 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_create_read_struct); LOAD_FUNCPTR(png_destroy_read_struct); LOAD_FUNCPTR(png_error); + LOAD_FUNCPTR(png_get_bit_depth); + LOAD_FUNCPTR(png_get_color_type); LOAD_FUNCPTR(png_get_error_ptr); + LOAD_FUNCPTR(png_get_image_height); + LOAD_FUNCPTR(png_get_image_width); LOAD_FUNCPTR(png_get_io_ptr); + LOAD_FUNCPTR(png_get_pHYs); + LOAD_FUNCPTR(png_get_PLTE); + LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_read_info); + LOAD_FUNCPTR(png_set_bgr); LOAD_FUNCPTR(png_set_crc_action); LOAD_FUNCPTR(png_set_error_fn); + LOAD_FUNCPTR(png_set_gray_to_rgb); LOAD_FUNCPTR(png_set_read_fn); + LOAD_FUNCPTR(png_set_swap); + LOAD_FUNCPTR(png_set_tRNS_to_alpha); #undef LOAD_FUNCPTR } @@ -106,6 +129,7 @@ static void *load_libpng(void) struct png_decoder { struct decoder decoder; + struct decoder_frame decoder_frame; }; static inline struct png_decoder *impl_from_decoder(struct decoder* iface) @@ -145,11 +169,22 @@ static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t lengt HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) { + struct png_decoder *This = impl_from_decoder(iface); png_structp png_ptr; png_infop info_ptr; png_infop end_info; jmp_buf jmpbuf; HRESULT hr = E_FAIL; + int color_type, bit_depth; + png_bytep trans; + int num_trans; + png_uint_32 transparency; + png_color_16p trans_values; + png_uint_32 ret, xres, yres; + int unit_type; + png_colorp png_palette; + int num_palette; + int i; png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (!png_ptr) @@ -193,10 +228,168 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str /* read the header */ ppng_read_info(png_ptr, info_ptr); + /* choose a pixel format */ + color_type = ppng_get_color_type(png_ptr, info_ptr); + bit_depth = ppng_get_bit_depth(png_ptr, info_ptr); + + /* PNGs with bit-depth greater than 8 are network byte order. Windows does not expect this. */ + if (bit_depth > 8) + ppng_set_swap(png_ptr); + + /* check for color-keyed alpha */ + transparency = ppng_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &trans_values); + if (!transparency) + num_trans = 0; + + if (transparency && (color_type == PNG_COLOR_TYPE_RGB || + (color_type == PNG_COLOR_TYPE_GRAY && bit_depth == 16))) + { + /* expand to RGBA */ + if (color_type == PNG_COLOR_TYPE_GRAY) + ppng_set_gray_to_rgb(png_ptr); + ppng_set_tRNS_to_alpha(png_ptr); + color_type = PNG_COLOR_TYPE_RGB_ALPHA; + } + + switch (color_type) + { + case PNG_COLOR_TYPE_GRAY_ALPHA: + /* WIC does not support grayscale alpha formats so use RGBA */ + ppng_set_gray_to_rgb(png_ptr); + /* fall through */ + case PNG_COLOR_TYPE_RGB_ALPHA: + This->decoder_frame.bpp = bit_depth * 4; + switch (bit_depth) + { + case 8: + ppng_set_bgr(png_ptr); + This->decoder_frame.pixel_format = GUID_WICPixelFormat32bppBGRA; + break; + case 16: This->decoder_frame.pixel_format = GUID_WICPixelFormat64bppRGBA; break; + default: + ERR("invalid RGBA bit depth: %i\n", bit_depth); + hr = E_FAIL; + goto end; + } + break; + case PNG_COLOR_TYPE_GRAY: + This->decoder_frame.bpp = bit_depth; + if (!transparency) + { + switch (bit_depth) + { + case 1: This->decoder_frame.pixel_format = GUID_WICPixelFormatBlackWhite; break; + case 2: This->decoder_frame.pixel_format = GUID_WICPixelFormat2bppGray; break; + case 4: This->decoder_frame.pixel_format = GUID_WICPixelFormat4bppGray; break; + case 8: This->decoder_frame.pixel_format = GUID_WICPixelFormat8bppGray; break; + case 16: This->decoder_frame.pixel_format = GUID_WICPixelFormat16bppGray; break; + default: + ERR("invalid grayscale bit depth: %i\n", bit_depth); + hr = E_FAIL; + goto end; + } + break; + } + /* else fall through */ + case PNG_COLOR_TYPE_PALETTE: + This->decoder_frame.bpp = bit_depth; + switch (bit_depth) + { + case 1: This->decoder_frame.pixel_format = GUID_WICPixelFormat1bppIndexed; break; + case 2: This->decoder_frame.pixel_format = GUID_WICPixelFormat2bppIndexed; break; + case 4: This->decoder_frame.pixel_format = GUID_WICPixelFormat4bppIndexed; break; + case 8: This->decoder_frame.pixel_format = GUID_WICPixelFormat8bppIndexed; break; + default: + ERR("invalid indexed color bit depth: %i\n", bit_depth); + hr = E_FAIL; + goto end; + } + break; + case PNG_COLOR_TYPE_RGB: + This->decoder_frame.bpp = bit_depth * 3; + switch (bit_depth) + { + case 8: + ppng_set_bgr(png_ptr); + This->decoder_frame.pixel_format = GUID_WICPixelFormat24bppBGR; + break; + case 16: This->decoder_frame.pixel_format = GUID_WICPixelFormat48bppRGB; break; + default: + ERR("invalid RGB color bit depth: %i\n", bit_depth); + hr = E_FAIL; + goto end; + } + break; + default: + ERR("invalid color type %i\n", color_type); + hr = E_FAIL; + goto end; + } + + This->decoder_frame.width = ppng_get_image_width(png_ptr, info_ptr); + This->decoder_frame.height = ppng_get_image_height(png_ptr, info_ptr); + + ret = ppng_get_pHYs(png_ptr, info_ptr, &xres, &yres, &unit_type); + + if (ret && unit_type == PNG_RESOLUTION_METER) + { + This->decoder_frame.dpix = xres * 0.0254; + This->decoder_frame.dpiy = yres * 0.0254; + } + else + { + WARN("no pHYs block present\n"); + This->decoder_frame.dpix = This->decoder_frame.dpiy = 96.0; + } + + if (color_type == PNG_COLOR_TYPE_PALETTE) + { + ret = ppng_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette); + if (!ret) + { + ERR("paletted image with no PLTE chunk\n"); + hr = E_FAIL; + goto end; + } + + if (num_palette > 256) + { + ERR("palette has %i colors?!\n", num_palette); + hr = E_FAIL; + goto end; + } + + This->decoder_frame.num_colors = num_palette; + for (i=0; i<num_palette; i++) + { + BYTE alpha = (i < num_trans) ? trans[i] : 0xff; + This->decoder_frame.palette[i] = (alpha << 24 | + png_palette[i].red << 16| + png_palette[i].green << 8| + png_palette[i].blue); + } + } + else if (color_type == PNG_COLOR_TYPE_GRAY && transparency && bit_depth <= 8) { + num_palette = 1 << bit_depth; + + This->decoder_frame.num_colors = num_palette; + for (i=0; i<num_palette; i++) + { + BYTE alpha = (i == trans_values[0].gray) ? 0 : 0xff; + BYTE val = i * 255 / (num_palette - 1); + This->decoder_frame.palette[i] = (alpha << 24 | val << 16 | val << 8 | val); + } + } + else + { + This->decoder_frame.num_colors = 0; + } + st->flags = WICBitmapDecoderCapabilityCanDecodeAllImages | WICBitmapDecoderCapabilityCanDecodeSomeImages | WICBitmapDecoderCapabilityCanEnumerateMetadata; st->frame_count = 1; + hr = S_OK; end: @@ -204,6 +397,13 @@ end: return hr; } +HRESULT CDECL png_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) +{ + struct png_decoder *This = impl_from_decoder(iface); + *info = This->decoder_frame; + return S_OK; +} + void CDECL png_decoder_destroy(struct decoder* iface) { struct png_decoder *This = impl_from_decoder(iface); @@ -213,6 +413,7 @@ void CDECL png_decoder_destroy(struct decoder* iface) static const struct decoder_funcs png_decoder_vtable = { png_decoder_initialize, + png_decoder_get_frame_info, png_decoder_destroy }; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 5a4d94ae4f3..d10afcedbc3 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -447,6 +447,7 @@ typedef struct { struct decoder *png_decoder; struct decoder_info decoder_info; struct decoder_stat file_info; + struct decoder_frame decoder_frame; png_structp png_ptr; png_infop info_ptr; png_infop end_info; @@ -605,6 +606,9 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p if (FAILED(hr)) goto end; + /* this function cannot fail in PNG decoder */ + decoder_get_frame_info(This->png_decoder, 0, &This->decoder_frame); + /* initialize libpng */ This->png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (!This->png_ptr) @@ -991,8 +995,8 @@ static HRESULT WINAPI PngDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - *puiWidth = This->width; - *puiHeight = This->height; + *puiWidth = This->decoder_frame.width; + *puiHeight = This->decoder_frame.height; TRACE("(%p)->(%u,%u)\n", iface, *puiWidth, *puiHeight); return S_OK; } @@ -1003,7 +1007,7 @@ static HRESULT WINAPI PngDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *ifa PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); TRACE("(%p,%p)\n", iface, pPixelFormat); - memcpy(pPixelFormat, This->format, sizeof(GUID)); + memcpy(pPixelFormat, &This->decoder_frame.pixel_format, sizeof(GUID)); return S_OK; } @@ -1012,25 +1016,9 @@ static HRESULT WINAPI PngDecoder_Frame_GetResolution(IWICBitmapFrameDecode *ifac double *pDpiX, double *pDpiY) { PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - png_uint_32 ret, xres, yres; - int unit_type; - - EnterCriticalSection(&This->lock); - - ret = ppng_get_pHYs(This->png_ptr, This->info_ptr, &xres, &yres, &unit_type); - - if (ret && unit_type == PNG_RESOLUTION_METER) - { - *pDpiX = xres * 0.0254; - *pDpiY = yres * 0.0254; - } - else - { - WARN("no pHYs block present\n"); - *pDpiX = *pDpiY = 96.0; - } - LeaveCriticalSection(&This->lock); + *pDpiX = This->decoder_frame.dpix; + *pDpiY = This->decoder_frame.dpiy; TRACE("(%p)->(%0.2f,%0.2f)\n", iface, *pDpiX, *pDpiY); @@ -1041,81 +1029,19 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, IWICPalette *pIPalette) { PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - png_uint_32 ret, color_type, bit_depth; - png_colorp png_palette; - int num_palette; - WICColor palette[256]; - png_bytep trans_alpha; - int num_trans; - png_color_16p trans_values; - int i; HRESULT hr=S_OK; TRACE("(%p,%p)\n", iface, pIPalette); - EnterCriticalSection(&This->lock); - - color_type = ppng_get_color_type(This->png_ptr, This->info_ptr); - bit_depth = ppng_get_bit_depth(This->png_ptr, This->info_ptr); - - if (color_type == PNG_COLOR_TYPE_PALETTE) + if (This->decoder_frame.num_colors) { - ret = ppng_get_PLTE(This->png_ptr, This->info_ptr, &png_palette, &num_palette); - if (!ret) - { - hr = WINCODEC_ERR_PALETTEUNAVAILABLE; - goto end; - } - - if (num_palette > 256) - { - ERR("palette has %i colors?!\n", num_palette); - hr = E_FAIL; - goto end; - } - - ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans_alpha, &num_trans, &trans_values); - if (!ret) num_trans = 0; - - for (i=0; i<num_palette; i++) - { - BYTE alpha = (i < num_trans) ? trans_alpha[i] : 0xff; - palette[i] = (alpha << 24 | - png_palette[i].red << 16| - png_palette[i].green << 8| - png_palette[i].blue); - } - } - else if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth <= 8) { - ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans_alpha, &num_trans, &trans_values); - - if (!ret) - { - hr = WINCODEC_ERR_PALETTEUNAVAILABLE; - goto end; - } - - num_palette = 1 << bit_depth; - - for (i=0; i<num_palette; i++) - { - BYTE alpha = (i == trans_values[0].gray) ? 0 : 0xff; - BYTE val = i * 255 / (num_palette - 1); - palette[i] = (alpha << 24 | val << 16 | val << 8 | val); - } + hr = IWICPalette_InitializeCustom(pIPalette, This->decoder_frame.palette, This->decoder_frame.num_colors); } else { hr = WINCODEC_ERR_PALETTEUNAVAILABLE; } -end: - - LeaveCriticalSection(&This->lock); - - if (SUCCEEDED(hr)) - hr = IWICPalette_InitializeCustom(pIPalette, palette, num_palette); - return hr; } diff --git a/dlls/windowscodecs/unix_iface.c b/dlls/windowscodecs/unix_iface.c index 924ed7f5c0d..cf66fbd964d 100644 --- a/dlls/windowscodecs/unix_iface.c +++ b/dlls/windowscodecs/unix_iface.c @@ -72,6 +72,12 @@ HRESULT CDECL decoder_wrapper_initialize(struct decoder* iface, IStream* stream, return unix_funcs->decoder_initialize(This->unix_decoder, stream, st); } +HRESULT CDECL decoder_wrapper_get_frame_info(struct decoder* iface, UINT frame, struct decoder_frame *info) +{ + struct decoder_wrapper* This = impl_from_decoder(iface); + return unix_funcs->decoder_get_frame_info(This->unix_decoder, frame, info); +} + void CDECL decoder_wrapper_destroy(struct decoder* iface) { struct decoder_wrapper* This = impl_from_decoder(iface); @@ -81,6 +87,7 @@ void CDECL decoder_wrapper_destroy(struct decoder* iface) static const struct decoder_funcs decoder_wrapper_vtable = { decoder_wrapper_initialize, + decoder_wrapper_get_frame_info, decoder_wrapper_destroy }; diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index fb4400bfe97..111a82dc637 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -66,6 +66,7 @@ HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *in static const struct unix_funcs unix_funcs = { decoder_create, decoder_initialize, + decoder_get_frame_info, decoder_destroy }; diff --git a/dlls/windowscodecs/wincodecs_common.h b/dlls/windowscodecs/wincodecs_common.h index ddc3d486dcd..ac8ae015c76 100644 --- a/dlls/windowscodecs/wincodecs_common.h +++ b/dlls/windowscodecs/wincodecs_common.h @@ -21,6 +21,11 @@ HRESULT CDECL decoder_initialize(struct decoder *decoder, IStream *stream, struc return decoder->vtable->initialize(decoder, stream, st); } +HRESULT CDECL decoder_get_frame_info(struct decoder *decoder, UINT frame, struct decoder_frame *info) +{ + return decoder->vtable->get_frame_info(decoder, frame, info); +} + void CDECL decoder_destroy(struct decoder *decoder) { decoder->vtable->destroy(decoder); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 110a0bd510a..6d12b98bfc4 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -267,6 +267,16 @@ struct decoder_stat DWORD frame_count; }; +struct decoder_frame +{ + CLSID pixel_format; + UINT width, height; + UINT bpp; + double dpix, dpiy; + DWORD num_colors; + WICColor palette[256]; +}; + struct decoder { const struct decoder_funcs *vtable; @@ -275,6 +285,7 @@ struct decoder struct decoder_funcs { HRESULT (CDECL *initialize)(struct decoder* This, IStream *stream, struct decoder_stat *st); + HRESULT (CDECL *get_frame_info)(struct decoder* This, UINT frame, struct decoder_frame *info); void (CDECL *destroy)(struct decoder* This); }; @@ -289,6 +300,7 @@ struct win32_funcs HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); HRESULT CDECL decoder_initialize(struct decoder *This, IStream *stream, struct decoder_stat *st); +HRESULT CDECL decoder_get_frame_info(struct decoder* This, UINT frame, struct decoder_frame *info); void CDECL decoder_destroy(struct decoder *This); HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result); @@ -297,6 +309,7 @@ struct unix_funcs { HRESULT (CDECL *decoder_create)(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); HRESULT (CDECL *decoder_initialize)(struct decoder *This, IStream *stream, struct decoder_stat *st); + HRESULT (CDECL *decoder_get_frame_info)(struct decoder* This, UINT frame, struct decoder_frame *info); void (CDECL *decoder_destroy)(struct decoder* This); }; -- 2.17.1

1 0

[PATCH 2/8] windowscodecs: Start loading PNG in unix lib.
by Esme Povirk 09 Oct '20

09 Oct '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/libpng.c | 159 ++++++++++++++++++++++++- dlls/windowscodecs/main.c | 19 +++ dlls/windowscodecs/pngformat.c | 21 +++- dlls/windowscodecs/unix_iface.c | 14 ++- dlls/windowscodecs/unix_lib.c | 15 +++ dlls/windowscodecs/wincodecs_common.h | 5 + dlls/windowscodecs/wincodecs_private.h | 20 ++++ 7 files changed, 247 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 336fbb389b8..f41ef765f9b 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -42,6 +42,67 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); #ifdef SONAME_LIBPNG +#include <png.h> + +static void *libpng_handle; +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(png_create_info_struct); +MAKE_FUNCPTR(png_create_read_struct); +MAKE_FUNCPTR(png_destroy_read_struct); +MAKE_FUNCPTR(png_error); +MAKE_FUNCPTR(png_get_error_ptr); +MAKE_FUNCPTR(png_get_io_ptr); +MAKE_FUNCPTR(png_read_info); +MAKE_FUNCPTR(png_set_crc_action); +MAKE_FUNCPTR(png_set_error_fn); +MAKE_FUNCPTR(png_set_read_fn); +#undef MAKE_FUNCPTR + +static CRITICAL_SECTION init_png_cs; +static CRITICAL_SECTION_DEBUG init_png_cs_debug = +{ + 0, 0, &init_png_cs, + { &init_png_cs_debug.ProcessLocksList, + &init_png_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": init_png_cs") } +}; +static CRITICAL_SECTION init_png_cs = { &init_png_cs_debug, -1, 0, 0, 0, 0 }; + +static void *load_libpng(void) +{ + void *result; + + RtlEnterCriticalSection(&init_png_cs); + + if(!libpng_handle && (libpng_handle = dlopen(SONAME_LIBPNG, RTLD_NOW)) != NULL) { + +#define LOAD_FUNCPTR(f) \ + if((p##f = dlsym(libpng_handle, #f)) == NULL) { \ + libpng_handle = NULL; \ + RtlLeaveCriticalSection(&init_png_cs); \ + return NULL; \ + } + LOAD_FUNCPTR(png_create_info_struct); + LOAD_FUNCPTR(png_create_read_struct); + LOAD_FUNCPTR(png_destroy_read_struct); + LOAD_FUNCPTR(png_error); + LOAD_FUNCPTR(png_get_error_ptr); + LOAD_FUNCPTR(png_get_io_ptr); + LOAD_FUNCPTR(png_read_info); + LOAD_FUNCPTR(png_set_crc_action); + LOAD_FUNCPTR(png_set_error_fn); + LOAD_FUNCPTR(png_set_read_fn); + +#undef LOAD_FUNCPTR + } + + result = libpng_handle; + + RtlLeaveCriticalSection(&init_png_cs); + + return result; +} + struct png_decoder { struct decoder decoder; @@ -52,6 +113,97 @@ static inline struct png_decoder *impl_from_decoder(struct decoder* iface) return CONTAINING_RECORD(iface, struct png_decoder, decoder); } +static void user_error_fn(png_structp png_ptr, png_const_charp error_message) +{ + jmp_buf *pjmpbuf; + + /* This uses setjmp/longjmp just like the default. We can't use the + * default because there's no way to access the jmp buffer in the png_struct + * that works in 1.2 and 1.4 and allows us to dynamically load libpng. */ + WARN("PNG error: %s\n", debugstr_a(error_message)); + pjmpbuf = ppng_get_error_ptr(png_ptr); + longjmp(*pjmpbuf, 1); +} + +static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message) +{ + WARN("PNG warning: %s\n", debugstr_a(warning_message)); +} + +static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) +{ + IStream *stream = ppng_get_io_ptr(png_ptr); + HRESULT hr; + ULONG bytesread; + + hr = stream_read(stream, data, length, &bytesread); + if (FAILED(hr) || bytesread != length) + { + ppng_error(png_ptr, "failed reading data"); + } +} + +HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) +{ + png_structp png_ptr; + png_infop info_ptr; + png_infop end_info; + jmp_buf jmpbuf; + HRESULT hr = E_FAIL; + + png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!png_ptr) + { + return E_FAIL; + } + + info_ptr = ppng_create_info_struct(png_ptr); + if (!info_ptr) + { + ppng_destroy_read_struct(&png_ptr, NULL, NULL); + return E_FAIL; + } + + end_info = ppng_create_info_struct(png_ptr); + if (!end_info) + { + ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return E_FAIL; + } + + /* set up setjmp/longjmp error handling */ + if (setjmp(jmpbuf)) + { + hr = WINCODEC_ERR_UNKNOWNIMAGEFORMAT; + goto end; + } + ppng_set_error_fn(png_ptr, jmpbuf, user_error_fn, user_warning_fn); + ppng_set_crc_action(png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE); + + /* seek to the start of the stream */ + hr = stream_seek(stream, 0, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) + { + goto end; + } + + /* set up custom i/o handling */ + ppng_set_read_fn(png_ptr, stream, user_read_data); + + /* read the header */ + ppng_read_info(png_ptr, info_ptr); + + st->flags = WICBitmapDecoderCapabilityCanDecodeAllImages | + WICBitmapDecoderCapabilityCanDecodeSomeImages | + WICBitmapDecoderCapabilityCanEnumerateMetadata; + st->frame_count = 1; + hr = S_OK; + +end: + ppng_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + return hr; +} + void CDECL png_decoder_destroy(struct decoder* iface) { struct png_decoder *This = impl_from_decoder(iface); @@ -60,6 +212,7 @@ void CDECL png_decoder_destroy(struct decoder* iface) } static const struct decoder_funcs png_decoder_vtable = { + png_decoder_initialize, png_decoder_destroy }; @@ -67,7 +220,11 @@ HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **res { struct png_decoder *This; - TRACE("\n"); + if (!load_libpng()) + { + ERR("Failed reading PNG because unable to find %s\n",SONAME_LIBPNG); + return E_FAIL; + } This = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*This)); diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 3849e24c2a1..2d8b0336f3f 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -255,6 +255,25 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, return hr; } +HRESULT CDECL stream_read(IStream *stream, void *buffer, ULONG read, ULONG *bytes_read) +{ + return IStream_Read(stream, buffer, read, bytes_read); +} + +HRESULT CDECL stream_seek(IStream *stream, LONGLONG ofs, DWORD origin, ULONGLONG *new_position) +{ + HRESULT hr; + LARGE_INTEGER ofs_large; + ULARGE_INTEGER pos_large; + + ofs_large.QuadPart = ofs; + hr = IStream_Seek(stream, ofs_large, origin, &pos_large); + if (new_position) + *new_position = pos_large.QuadPart; + + return hr; +} + void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT stride) { UINT x, y; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 3b326c1266f..5a4d94ae4f3 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -446,6 +446,7 @@ typedef struct { IStream *stream; struct decoder *png_decoder; struct decoder_info decoder_info; + struct decoder_stat file_info; png_structp png_ptr; png_infop info_ptr; png_infop end_info; @@ -543,6 +544,7 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) static HRESULT WINAPI PngDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream, DWORD *capability) { + PngDecoder *This = impl_from_IWICBitmapDecoder(iface); HRESULT hr; TRACE("(%p,%p,%p)\n", iface, stream, capability); @@ -552,9 +554,7 @@ static HRESULT WINAPI PngDecoder_QueryCapability(IWICBitmapDecoder *iface, IStre hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand); if (hr != S_OK) return hr; - *capability = WICBitmapDecoderCapabilityCanDecodeAllImages | - WICBitmapDecoderCapabilityCanDecodeSomeImages; - /* FIXME: WICBitmapDecoderCapabilityCanEnumerateMetadata */ + *capability = (This->file_info.flags & DECODER_FLAGS_CAPABILITY_MASK); return S_OK; } @@ -595,6 +595,16 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p EnterCriticalSection(&This->lock); + if (This->initialized) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + hr = decoder_initialize(This->png_decoder, pIStream, &This->file_info); + if (FAILED(hr)) + goto end; + /* initialize libpng */ This->png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (!This->png_ptr) @@ -896,9 +906,12 @@ static HRESULT WINAPI PngDecoder_GetThumbnail(IWICBitmapDecoder *iface, static HRESULT WINAPI PngDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { + PngDecoder *This = impl_from_IWICBitmapDecoder(iface); if (!pCount) return E_INVALIDARG; - *pCount = 1; + if (!This->initialized) return WINCODEC_ERR_WRONGSTATE; + + *pCount = This->file_info.frame_count; return S_OK; } diff --git a/dlls/windowscodecs/unix_iface.c b/dlls/windowscodecs/unix_iface.c index cae64a6774c..924ed7f5c0d 100644 --- a/dlls/windowscodecs/unix_iface.c +++ b/dlls/windowscodecs/unix_iface.c @@ -39,9 +39,14 @@ static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; static const struct unix_funcs *unix_funcs; +static const struct win32_funcs win32_funcs = { + stream_read, + stream_seek +}; + static BOOL WINAPI load_unixlib( INIT_ONCE *once, void *param, void **context ) { - __wine_init_unix_lib( windowscodecs_module, DLL_PROCESS_ATTACH, NULL, &unix_funcs ); + __wine_init_unix_lib( windowscodecs_module, DLL_PROCESS_ATTACH, &win32_funcs, &unix_funcs ); return TRUE; } @@ -61,6 +66,12 @@ static inline struct decoder_wrapper *impl_from_decoder(struct decoder* iface) return CONTAINING_RECORD(iface, struct decoder_wrapper, win32_decoder); } +HRESULT CDECL decoder_wrapper_initialize(struct decoder* iface, IStream* stream, struct decoder_stat *st) +{ + struct decoder_wrapper* This = impl_from_decoder(iface); + return unix_funcs->decoder_initialize(This->unix_decoder, stream, st); +} + void CDECL decoder_wrapper_destroy(struct decoder* iface) { struct decoder_wrapper* This = impl_from_decoder(iface); @@ -69,6 +80,7 @@ void CDECL decoder_wrapper_destroy(struct decoder* iface) } static const struct decoder_funcs decoder_wrapper_vtable = { + decoder_wrapper_initialize, decoder_wrapper_destroy }; diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index 80321d5b745..fb4400bfe97 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -43,6 +43,18 @@ #include "wincodecs_common.h" +static const struct win32_funcs *win32_funcs; + +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 decoder_create(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result) { if (IsEqualGUID(decoder_clsid, &CLSID_WICPngDecoder)) @@ -53,6 +65,7 @@ HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *in static const struct unix_funcs unix_funcs = { decoder_create, + decoder_initialize, decoder_destroy }; @@ -60,6 +73,8 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p { if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; + win32_funcs = ptr_in; + *(const struct unix_funcs **)ptr_out = &unix_funcs; return STATUS_SUCCESS; } diff --git a/dlls/windowscodecs/wincodecs_common.h b/dlls/windowscodecs/wincodecs_common.h index 4592a7ee15b..ddc3d486dcd 100644 --- a/dlls/windowscodecs/wincodecs_common.h +++ b/dlls/windowscodecs/wincodecs_common.h @@ -16,6 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +HRESULT CDECL decoder_initialize(struct decoder *decoder, IStream *stream, struct decoder_stat *st) +{ + return decoder->vtable->initialize(decoder, stream, st); +} + void CDECL decoder_destroy(struct decoder *decoder) { decoder->vtable->destroy(decoder); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 0085639b2e1..110a0bd510a 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -259,6 +259,14 @@ struct decoder_info CLSID clsid; }; +#define DECODER_FLAGS_CAPABILITY_MASK 0x1f + +struct decoder_stat +{ + DWORD flags; + DWORD frame_count; +}; + struct decoder { const struct decoder_funcs *vtable; @@ -266,10 +274,21 @@ struct decoder struct decoder_funcs { + HRESULT (CDECL *initialize)(struct decoder* This, IStream *stream, struct decoder_stat *st); void (CDECL *destroy)(struct decoder* This); }; +HRESULT CDECL stream_read(IStream *stream, void *buffer, ULONG read, ULONG *bytes_read); +HRESULT CDECL stream_seek(IStream *stream, LONGLONG ofs, DWORD origin, ULONGLONG *new_position); + +struct win32_funcs +{ + HRESULT (CDECL *stream_read)(IStream *stream, void *buffer, ULONG read, ULONG *bytes_read); + HRESULT (CDECL *stream_seek)(IStream *stream, LONGLONG ofs, DWORD origin, ULONGLONG *new_position); +}; + HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); +HRESULT CDECL decoder_initialize(struct decoder *This, IStream *stream, struct decoder_stat *st); void CDECL decoder_destroy(struct decoder *This); HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result); @@ -277,6 +296,7 @@ HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **res struct unix_funcs { HRESULT (CDECL *decoder_create)(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); + HRESULT (CDECL *decoder_initialize)(struct decoder *This, IStream *stream, struct decoder_stat *st); void (CDECL *decoder_destroy)(struct decoder* This); }; -- 2.17.1

1 0

[PATCH 1/8] windowscodecs: Add a unix library and start to use it for PNG.
by Esme Povirk 09 Oct '20

09 Oct '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/Makefile.in | 3 + dlls/windowscodecs/libpng.c | 98 ++++++++++++++++++++++++ dlls/windowscodecs/main.c | 5 ++ dlls/windowscodecs/pngformat.c | 20 ++++- dlls/windowscodecs/unix_iface.c | 102 +++++++++++++++++++++++++ dlls/windowscodecs/unix_lib.c | 66 ++++++++++++++++ dlls/windowscodecs/wincodecs_common.h | 23 ++++++ dlls/windowscodecs/wincodecs_private.h | 35 +++++++++ 8 files changed, 349 insertions(+), 3 deletions(-) create mode 100644 dlls/windowscodecs/libpng.c create mode 100644 dlls/windowscodecs/unix_iface.c create mode 100644 dlls/windowscodecs/unix_lib.c create mode 100644 dlls/windowscodecs/wincodecs_common.h diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index fac90344fa3..fde28aea778 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -21,6 +21,7 @@ C_SRCS = \ imgfactory.c \ info.c \ jpegformat.c \ + libpng.c \ main.c \ metadatahandler.c \ metadataquery.c \ @@ -34,6 +35,8 @@ C_SRCS = \ tgaformat.c \ tiffformat.c \ ungif.c \ + unix_iface.c \ + unix_lib.c \ uuid.c RC_SRCS = version.rc diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c new file mode 100644 index 00000000000..336fbb389b8 --- /dev/null +++ b/dlls/windowscodecs/libpng.c @@ -0,0 +1,98 @@ +/* + * 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 "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +#ifdef SONAME_LIBPNG + +struct png_decoder +{ + struct decoder decoder; +}; + +static inline struct png_decoder *impl_from_decoder(struct decoder* iface) +{ + return CONTAINING_RECORD(iface, struct png_decoder, decoder); +} + +void CDECL png_decoder_destroy(struct decoder* iface) +{ + struct png_decoder *This = impl_from_decoder(iface); + + RtlFreeHeap(GetProcessHeap(), 0, This); +} + +static const struct decoder_funcs png_decoder_vtable = { + png_decoder_destroy +}; + +HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result) +{ + struct png_decoder *This; + + TRACE("\n"); + + This = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*This)); + + if (!This) + { + return E_OUTOFMEMORY; + } + + This->decoder.vtable = &png_decoder_vtable; + *result = &This->decoder; + + info->container_format = GUID_ContainerFormatPng; + info->block_format = GUID_ContainerFormatPng; + info->clsid = CLSID_WICPngDecoder; + + return S_OK; +} + +#else + +HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result) +{ + ERR("Trying to load PNG picture, but PNG support is not compiled in.\n"); + return E_FAIL; +} + +#endif + diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 7e03112a63c..3849e24c2a1 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -32,8 +32,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include "wincodecs_common.h" + extern BOOL WINAPI WIC_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; +extern HMODULE windowscodecs_module; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -41,6 +45,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); + windowscodecs_module = hinstDLL; break; case DLL_PROCESS_DETACH: ReleaseComponentInfos(); diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 3cf47b4211f..3b326c1266f 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -444,6 +444,8 @@ typedef struct { IWICMetadataBlockReader IWICMetadataBlockReader_iface; LONG ref; IStream *stream; + struct decoder *png_decoder; + struct decoder_info decoder_info; png_structp png_ptr; png_infop info_ptr; png_infop end_info; @@ -521,6 +523,8 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) IStream_Release(This->stream); if (This->png_ptr) ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); + if (This->png_decoder) + decoder_destroy(This->png_decoder); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This->image_bits); @@ -828,16 +832,18 @@ end: static HRESULT WINAPI PngDecoder_GetContainerFormat(IWICBitmapDecoder *iface, GUID *pguidContainerFormat) { - memcpy(pguidContainerFormat, &GUID_ContainerFormatPng, sizeof(GUID)); + PngDecoder *This = impl_from_IWICBitmapDecoder(iface); + memcpy(pguidContainerFormat, &This->decoder_info.container_format, sizeof(GUID)); return S_OK; } static HRESULT WINAPI PngDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { + PngDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - return get_decoder_info(&CLSID_WICPngDecoder, ppIDecoderInfo); + return get_decoder_info(&This->decoder_info.clsid, ppIDecoderInfo); } static HRESULT WINAPI PngDecoder_CopyPalette(IWICBitmapDecoder *iface, @@ -1208,8 +1214,9 @@ static ULONG WINAPI PngDecoder_Block_Release(IWICMetadataBlockReader *iface) static HRESULT WINAPI PngDecoder_Block_GetContainerFormat(IWICMetadataBlockReader *iface, GUID *pguidContainerFormat) { + PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); if (!pguidContainerFormat) return E_INVALIDARG; - memcpy(pguidContainerFormat, &GUID_ContainerFormatPng, sizeof(GUID)); + memcpy(pguidContainerFormat, &This->decoder_info.block_format, sizeof(GUID)); return S_OK; } @@ -1312,6 +1319,13 @@ HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv) This = HeapAlloc(GetProcessHeap(), 0, sizeof(PngDecoder)); if (!This) return E_OUTOFMEMORY; + ret = get_unix_decoder(&CLSID_WICPngDecoder, &This->decoder_info, &This->png_decoder); + if (FAILED(ret)) + { + HeapFree(GetProcessHeap(), 0, This); + return ret; + } + This->IWICBitmapDecoder_iface.lpVtbl = &PngDecoder_Vtbl; This->IWICBitmapFrameDecode_iface.lpVtbl = &PngDecoder_FrameVtbl; This->IWICMetadataBlockReader_iface.lpVtbl = &PngDecoder_BlockVtbl; diff --git a/dlls/windowscodecs/unix_iface.c b/dlls/windowscodecs/unix_iface.c new file mode 100644 index 00000000000..cae64a6774c --- /dev/null +++ b/dlls/windowscodecs/unix_iface.c @@ -0,0 +1,102 @@ +/* + * unix_iface.c - This is the Win32 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#define NONAMELESSUNION +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "winternl.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + +static const struct unix_funcs *unix_funcs; + +static BOOL WINAPI load_unixlib( INIT_ONCE *once, void *param, void **context ) +{ + __wine_init_unix_lib( windowscodecs_module, DLL_PROCESS_ATTACH, NULL, &unix_funcs ); + return TRUE; +} + +static void init_unixlib(void) +{ + InitOnceExecuteOnce( &init_once, load_unixlib, NULL, NULL ); +} + +struct decoder_wrapper +{ + struct decoder win32_decoder; + struct decoder *unix_decoder; +}; + +static inline struct decoder_wrapper *impl_from_decoder(struct decoder* iface) +{ + return CONTAINING_RECORD(iface, struct decoder_wrapper, win32_decoder); +} + +void CDECL decoder_wrapper_destroy(struct decoder* iface) +{ + struct decoder_wrapper* This = impl_from_decoder(iface); + unix_funcs->decoder_destroy(This->unix_decoder); + HeapFree(GetProcessHeap(), 0, This); +} + +static const struct decoder_funcs decoder_wrapper_vtable = { + decoder_wrapper_destroy +}; + +HRESULT get_unix_decoder(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result) +{ + HRESULT hr; + struct decoder_wrapper *wrapper; + struct decoder *unix_decoder; + + init_unixlib(); + + hr = unix_funcs->decoder_create(decoder_clsid, info, &unix_decoder); + + if (SUCCEEDED(hr)) + { + wrapper = HeapAlloc(GetProcessHeap(), 0, sizeof(*wrapper)); + + if (!wrapper) + { + unix_funcs->decoder_destroy(unix_decoder); + return E_OUTOFMEMORY; + } + + wrapper->win32_decoder.vtable = &decoder_wrapper_vtable; + wrapper->unix_decoder = unix_decoder; + *result = &wrapper->win32_decoder; + } + + return hr; +} + diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c new file mode 100644 index 00000000000..80321d5b745 --- /dev/null +++ b/dlls/windowscodecs/unix_lib.c @@ -0,0 +1,66 @@ +/* + * 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" + +#include "wincodecs_common.h" + +HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result) +{ + if (IsEqualGUID(decoder_clsid, &CLSID_WICPngDecoder)) + return png_decoder_create(info, result); + + return E_NOTIMPL; +} + +static const struct unix_funcs unix_funcs = { + decoder_create, + decoder_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; + + *(const struct unix_funcs **)ptr_out = &unix_funcs; + return STATUS_SUCCESS; +} + diff --git a/dlls/windowscodecs/wincodecs_common.h b/dlls/windowscodecs/wincodecs_common.h new file mode 100644 index 00000000000..4592a7ee15b --- /dev/null +++ b/dlls/windowscodecs/wincodecs_common.h @@ -0,0 +1,23 @@ +/* + * 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 + */ + +void CDECL decoder_destroy(struct decoder *decoder) +{ + decoder->vtable->destroy(decoder); +} + diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index f7665d11732..0085639b2e1 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -247,4 +247,39 @@ static inline const char *debug_wic_rect(const WICRect *rect) return wine_dbg_sprintf("(%u,%u)-(%u,%u)", rect->X, rect->Y, rect->Width, rect->Height); } +HMODULE windowscodecs_module; + +/* unixlib iface */ +struct decoder_funcs; + +struct decoder_info +{ + GUID container_format; + GUID block_format; + CLSID clsid; +}; + +struct decoder +{ + const struct decoder_funcs *vtable; +}; + +struct decoder_funcs +{ + void (CDECL *destroy)(struct decoder* This); +}; + +HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); +void CDECL decoder_destroy(struct decoder *This); + +HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result); + +struct unix_funcs +{ + HRESULT (CDECL *decoder_create)(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); + void (CDECL *decoder_destroy)(struct decoder* This); +}; + +HRESULT get_unix_decoder(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); + #endif /* WINCODECS_PRIVATE_H */ -- 2.17.1

1 0

[PATCH 2/2] localui/tests: Use strings instead of arrays of chars
by Michael Stefaniuc 09 Oct '20

09 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/localui/tests/localui.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index d323dc067b3..23be8c779d1 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -43,8 +43,6 @@ static PMONITORUI pui; static BOOL (WINAPI *pAddPortUI)(PCWSTR, HWND, PCWSTR, PWSTR *); static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); -static const CHAR fmt_comA[] = {'C','O','M','%','u',':',0}; -static const CHAR fmt_lptA[] = {'L','P','T','%','u',':',0}; static LPBYTE pi_buffer; static DWORD pi_numports; @@ -304,7 +302,7 @@ START_TEST(localui) /* "LPT1:" - "LPT9:" */ while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, fmt_lptA, id); + sprintf(bufferA, "LPT%u:", id); MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); pi2 = find_portinfo2(bufferW); if (pi2 && (lpt_present == NULL)) lpt_present = pi2; @@ -315,7 +313,7 @@ START_TEST(localui) /* "COM1:" - "COM9:" */ while (((com_present == NULL) || (com_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, fmt_comA, id); + sprintf(bufferA, "COM%u:", id); MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); pi2 = find_portinfo2(bufferW); if (pi2 && (com_present == NULL)) com_present = pi2; -- 2.25.4

1 0

[PATCH] wer: Use wide-char string literals.
by Michael Stefaniuc 09 Oct '20

09 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wer/main.c | 6 +----- dlls/wer/tests/main.c | 30 +++++++++++++----------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index b40aa1b7625..ad57cbdf40e 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -48,11 +48,7 @@ static CRITICAL_SECTION report_table_cs = { &report_table_cs_debug, -1, 0, 0, 0, static struct list report_table = LIST_INIT(report_table); -static const WCHAR regpath_exclude[] = - {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','E','r','r','o','r',' ','R','e','p','o','r','t','i','n','g','\\', - 'E','x','c','l','u','d','e','d','A','p','p','l','i','c','a','t','i','o','n','s',0}; +static const WCHAR regpath_exclude[] = L"Software\\Microsoft\\Windows Error Reporting\\ExcludedApplications"; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index 7fa9a8c67f5..038b29c25a9 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -29,11 +29,7 @@ #include "werapi.h" #include "wine/test.h" - -static const WCHAR appcrash[] = {'A','P','P','C','R','A','S','H',0}; -static const WCHAR backslash[] = {'\\',0}; -static const WCHAR empty[] = {0}; -static const WCHAR winetest_wer[] = {'w','i','n','e','t','e','s','t','_','w','e','r','.','e','x','e',0}; +static const WCHAR winetest_wer[] = L"winetest_wer.exe"; /* ###### */ @@ -51,7 +47,7 @@ static void test_WerAddExcludedApplication(void) hr = WerAddExcludedApplication(NULL, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); - hr = WerAddExcludedApplication(empty, FALSE); + hr = WerAddExcludedApplication(L"", FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); hr = WerAddExcludedApplication(winetest_wer, FALSE); @@ -74,7 +70,7 @@ static void test_WerAddExcludedApplication(void) hr = WerRemoveExcludedApplication(buffer, FALSE); ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); - lstrcatW(buffer, backslash); + lstrcatW(buffer, L"\\"); hr = WerAddExcludedApplication(buffer, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); @@ -106,7 +102,7 @@ static void test_WerRemoveExcludedApplication(void) hr = WerRemoveExcludedApplication(NULL, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); - hr = WerRemoveExcludedApplication(empty, FALSE); + hr = WerRemoveExcludedApplication(L"", FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); hr = WerRemoveExcludedApplication(winetest_wer, FALSE); @@ -130,7 +126,7 @@ static void test_WerRemoveExcludedApplication(void) hr = WerRemoveExcludedApplication(buffer, FALSE); ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); - lstrcatW(buffer, backslash); + lstrcatW(buffer, L"\\"); hr = WerAddExcludedApplication(buffer, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); hr = WerRemoveExcludedApplication(buffer, FALSE); @@ -152,7 +148,7 @@ static void test_WerReportCloseHandle(void) HREPORT report; report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, WerReportCritical, NULL, &report); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, &report); ok(hr == S_OK, "got 0x%x and %p (expected S_OK)\n", hr, report); if (!report) { @@ -183,7 +179,7 @@ static void test_WerReportCreate(void) report = (void *) 0xdeadbeef; /* test a simple valid case */ - hr = WerReportCreate(appcrash, WerReportCritical, NULL, &report); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, &report); ok(hr == S_OK, "got 0x%x and %p (expected S_OK)\n", hr, report); if (!report) { @@ -195,7 +191,7 @@ static void test_WerReportCreate(void) ok(hr == S_OK, "got 0x%x for %p (expected S_OK)\n", hr, report); /* the ptr to store the created handle is always needed */ - hr = WerReportCreate(appcrash, WerReportCritical, NULL, NULL); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, NULL); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); /* the event type must be a valid string */ @@ -204,13 +200,13 @@ static void test_WerReportCreate(void) ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); report = (void *) 0xdeadbeef; - hr = WerReportCreate(empty, WerReportCritical, NULL, &report); + hr = WerReportCreate(L"", WerReportCritical, NULL, &report); ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); /* a valid WER_REPORT_TYPE works */ for (i = 0; i < WerReportInvalid; i++) { report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, i, NULL, &report); + hr = WerReportCreate(L"APPCRASH", i, NULL, &report); ok(hr == S_OK, "%d: got 0x%x and %p (expected S_OK)\n", i, hr, report); hr = WerReportCloseHandle(report); @@ -222,7 +218,7 @@ static void test_WerReportCreate(void) but older windows versions did not check the report type and WerReportCreate always succeeded */ report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, WerReportInvalid, NULL, &report); + hr = WerReportCreate(L"APPCRASH", WerReportInvalid, NULL, &report); ok((hr == E_INVALIDARG) | broken(hr == S_OK), "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); if (hr == S_OK) { @@ -231,7 +227,7 @@ static void test_WerReportCreate(void) } report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, 42, NULL, &report); + hr = WerReportCreate(L"APPCRASH", 42, NULL, &report); ok((hr == E_INVALIDARG) | broken(hr == S_OK), "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); if (hr == S_OK) { @@ -243,7 +239,7 @@ static void test_WerReportCreate(void) memset(table, 0, sizeof(table)); for (i = 0; i < (ARRAY_SIZE(table) - 1); i++) { report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, WerReportCritical, NULL, &table[i]); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, &table[i]); ok(hr == S_OK, "%02d: got 0x%x and %p (expected S_OK)\n", i, hr, table[i]); } -- 2.25.4

1 0

[PATCH 1/2] localui: Use wide-char string literals.
by Michael Stefaniuc 09 Oct '20

09 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/localui/localui.c | 58 ++++++++++-------------------------- dlls/localui/tests/localui.c | 19 +++++------- 2 files changed, 23 insertions(+), 54 deletions(-) diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index ab8f5c95d52..87522494a1d 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -38,32 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(localui); static HINSTANCE LOCALUI_hInstance; -static const WCHAR cmd_AddPortW[] = {'A','d','d','P','o','r','t',0}; -static const WCHAR cmd_ConfigureLPTPortCommandOKW[] = {'C','o','n','f','i','g','u','r','e', - 'L','P','T','P','o','r','t', - 'C','o','m','m','a','n','d','O','K',0}; -static const WCHAR cmd_DeletePortW[] = {'D','e','l','e','t','e','P','o','r','t',0}; -static const WCHAR cmd_GetDefaultCommConfigW[] = {'G','e','t', - 'D','e','f','a','u','l','t', - 'C','o','m','m','C','o','n','f','i','g',0}; -static const WCHAR cmd_GetTransmissionRetryTimeoutW[] = {'G','e','t', - 'T','r','a','n','s','m','i','s','s','i','o','n', - 'R','e','t','r','y','T','i','m','e','o','u','t',0}; -static const WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; -static const WCHAR cmd_SetDefaultCommConfigW[] = {'S','e','t', - 'D','e','f','a','u','l','t', - 'C','o','m','m','C','o','n','f','i','g',0}; - -static const WCHAR fmt_uW[] = {'%','u',0}; -static const WCHAR portname_LPT[] = {'L','P','T',0}; -static const WCHAR portname_COM[] = {'C','O','M',0}; -static const WCHAR portname_FILE[] = {'F','I','L','E',':',0}; -static const WCHAR portname_CUPS[] = {'C','U','P','S',':',0}; -static const WCHAR portname_LPR[] = {'L','P','R',':',0}; - -static const WCHAR XcvMonitorW[] = {',','X','c','v','M','o','n','i','t','o','r',' ',0}; -static const WCHAR XcvPortW[] = {',','X','c','v','P','o','r','t',' ',0}; - /*****************************************************/ typedef struct tag_addportui_t { @@ -121,7 +95,7 @@ static BOOL dlg_configure_com(HANDLE hXcv, HWND hWnd, PCWSTR pPortName) /* get current settings */ len = FIELD_OFFSET(COMMCONFIG, wcProviderData[1]); status = ERROR_SUCCESS; - res = XcvDataW( hXcv, cmd_GetDefaultCommConfigW, + res = XcvDataW( hXcv, L"GetDefaultCommConfig", (PBYTE) shortname, (lstrlenW(shortname) +1) * sizeof(WCHAR), (PBYTE) &cfg, len, &len, &status); @@ -132,7 +106,7 @@ static BOOL dlg_configure_com(HANDLE hXcv, HWND hWnd, PCWSTR pPortName) if (res) { status = ERROR_SUCCESS; /* set new settings */ - res = XcvDataW(hXcv, cmd_SetDefaultCommConfigW, + res = XcvDataW(hXcv, L"SetDefaultCommConfig", (PBYTE) &cfg, len, (PBYTE) &dummy, 0, &len, &status); } @@ -292,7 +266,7 @@ static INT_PTR CALLBACK dlgproc_addport(HWND hwnd, UINT msg, WPARAM wparam, LPAR /* length is in WCHAR, including the '\0' */ GetDlgItemTextW(hwnd, ADDPORT_EDIT, data->portname, len + 1); status = ERROR_SUCCESS; - res = XcvDataW( data->hXcv, cmd_PortIsValidW, (PBYTE) data->portname, + res = XcvDataW( data->hXcv, L"PortIsValid", (BYTE *) data->portname, (lstrlenW(data->portname) + 1) * sizeof(WCHAR), (PBYTE) &dummy, 0, &len, &status); @@ -356,7 +330,7 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP /* Get current setting */ data->value = 45; status = ERROR_SUCCESS; - res = XcvDataW( data->hXcv, cmd_GetTransmissionRetryTimeoutW, + res = XcvDataW( data->hXcv, L"GetTransmissionRetryTimeout", (PBYTE) &dummy, 0, (PBYTE) &data->value, sizeof(data->value), &len, &status); @@ -379,8 +353,8 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP /* native localui.dll use the same limits */ if ((res > 0) && (res < 1000000) && status) { - swprintf(bufferW, ARRAY_SIZE(bufferW), fmt_uW, res); - res = XcvDataW( data->hXcv, cmd_ConfigureLPTPortCommandOKW, + swprintf(bufferW, ARRAY_SIZE(bufferW), L"%u", res); + res = XcvDataW( data->hXcv, L"ConfigureLPTPortCommandOK", (PBYTE) bufferW, (lstrlenW(bufferW) +1) * sizeof(WCHAR), (PBYTE) &dummy, 0, &len, &status); @@ -415,13 +389,13 @@ static DWORD get_type_from_name(LPCWSTR name) { HANDLE hfile; - if (!wcsnicmp(name, portname_LPT, ARRAY_SIZE(portname_LPT) -1)) + if (!wcsnicmp(name, L"LPT", ARRAY_SIZE(L"LPT") -1)) return PORT_IS_LPT; - if (!wcsnicmp(name, portname_COM, ARRAY_SIZE(portname_COM) -1)) + if (!wcsnicmp(name, L"COM", ARRAY_SIZE(L"COM") -1)) return PORT_IS_COM; - if (!wcsicmp(name, portname_FILE)) + if (!wcsicmp(name, L"FILE:")) return PORT_IS_FILE; if (name[0] == '/') @@ -430,10 +404,10 @@ static DWORD get_type_from_name(LPCWSTR name) if (name[0] == '|') return PORT_IS_PIPE; - if (!wcsncmp(name, portname_CUPS, ARRAY_SIZE(portname_CUPS) -1)) + if (!wcsncmp(name, L"CUPS:", ARRAY_SIZE(L"CUPS:") -1)) return PORT_IS_CUPS; - if (!wcsncmp(name, portname_LPR, ARRAY_SIZE(portname_LPR) -1)) + if (!wcsncmp(name, L"LPR:", ARRAY_SIZE(L"LPR:") -1)) return PORT_IS_LPR; /* Must be a file or a directory. Does the file exist ? */ @@ -508,7 +482,7 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam TRACE( "(%s, %p, %s, %p) (*ppPortName: %p)\n", debugstr_w(pName), hWnd, debugstr_w(pMonitorName), ppPortName, ppPortName ? *ppPortName : NULL); - if (open_monitor_by_name(XcvMonitorW, pMonitorName, &hXcv)) { + if (open_monitor_by_name(L",XcvMonitor ", pMonitorName, &hXcv)) { ZeroMemory(&data, sizeof(addportui_t)); data.hXcv = hXcv; @@ -520,7 +494,7 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam if (ppPortName) *ppPortName = NULL; if (res) { - res = XcvDataW(hXcv, cmd_AddPortW, (PBYTE) data.portname, + res = XcvDataW(hXcv, L"AddPort", (BYTE *) data.portname, (lstrlenW(data.portname)+1) * sizeof(WCHAR), (PBYTE) &dummy, 0, &needed, &status); @@ -572,7 +546,7 @@ static BOOL WINAPI localui_ConfigurePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPort DWORD res; TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); - if (open_monitor_by_name(XcvPortW, pPortName, &hXcv)) { + if (open_monitor_by_name(L",XcvPort ", pPortName, &hXcv)) { res = get_type_from_name(pPortName); switch(res) @@ -631,10 +605,10 @@ static BOOL WINAPI localui_DeletePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPortNam return FALSE; } - if (open_monitor_by_name(XcvPortW, pPortName, &hXcv)) { + if (open_monitor_by_name(L",XcvPort ", pPortName, &hXcv)) { /* native localui tests here for LPT / COM - Ports and failed with ERROR_NOT_SUPPORTED. */ - if (XcvDataW(hXcv, cmd_DeletePortW, (LPBYTE) pPortName, + if (XcvDataW(hXcv, L"DeletePort", (BYTE *) pPortName, (lstrlenW(pPortName)+1) * sizeof(WCHAR), (LPBYTE) &dummy, 0, &needed, &status)) { ClosePrinter(hXcv); diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index f051880fd1c..d323dc067b3 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -43,13 +43,8 @@ static PMONITORUI pui; static BOOL (WINAPI *pAddPortUI)(PCWSTR, HWND, PCWSTR, PWSTR *); static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); - -static const WCHAR does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; -static const WCHAR emptyW[] = {0}; static const CHAR fmt_comA[] = {'C','O','M','%','u',':',0}; static const CHAR fmt_lptA[] = {'L','P','T','%','u',':',0}; -static const WCHAR localportW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; -static const WCHAR portname_fileW[] = {'F','I','L','E',':',0}; static LPBYTE pi_buffer; static DWORD pi_numports; @@ -148,14 +143,14 @@ static void test_AddPortUI(void) "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); SetLastError(0xdeadbeef); - res = pAddPortUI(NULL, NULL, emptyW, NULL); + res = pAddPortUI(NULL, NULL, L"", NULL); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); SetLastError(0xdeadbeef); - res = pAddPortUI(NULL, NULL, does_not_existW, NULL); + res = pAddPortUI(NULL, NULL, L"does_not_exist", NULL); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " @@ -172,7 +167,7 @@ static void test_AddPortUI(void) * - When the new port starts with "COM" or "LPT", * FALSE is returned with ERROR_NOT_SUPPORTED on windows */ - res = pAddPortUI(NULL, NULL, localportW, &new_portname); + res = pAddPortUI(NULL, NULL, L"Local Port", &new_portname); ok( res || (GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED) || @@ -205,7 +200,7 @@ static void test_ConfigurePortUI(void) "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); SetLastError(0xdeadbeef); - res = pConfigurePortUI(NULL, NULL, emptyW); + res = pConfigurePortUI(NULL, NULL, L""); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " @@ -213,7 +208,7 @@ static void test_ConfigurePortUI(void) SetLastError(0xdeadbeef); - res = pConfigurePortUI(NULL, NULL, does_not_existW); + res = pConfigurePortUI(NULL, NULL, L"does_not_exist"); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " @@ -258,7 +253,7 @@ static void test_ConfigurePortUI(void) if (winetest_interactive && file_present) { SetLastError(0xdeadbeef); - res = pConfigurePortUI(NULL, NULL, portname_fileW); + res = pConfigurePortUI(NULL, NULL, L"FILE:"); ok( !res && ((GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED)), "got %d with %u (expected '0' with: ERROR_CANCELLED or " @@ -300,7 +295,7 @@ START_TEST(localui) /* find installed ports */ /* "FILE:" */ - file_present = find_portinfo2(portname_fileW); + file_present = find_portinfo2(L"FILE:"); if (!pi_numports) /* Nothing to test without a port */ return; -- 2.25.4

1 0

[PATCH] vbscript: support for class default sub.
by Robert Wilhelm 09 Oct '20

09 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35744 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/compile.c | 37 +++++++++++++++++++++++++++--------- dlls/vbscript/interp.c | 2 +- dlls/vbscript/parser.y | 4 ++++ dlls/vbscript/tests/lang.vbs | 31 ++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 2 +- dlls/vbscript/vbscript.h | 4 +++- 6 files changed, 68 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 2e991b0c0ae..d0342a128b1 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1456,11 +1456,13 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f switch(func->type) { case FUNC_FUNCTION: + case FUNC_DEFFUNC: ctx->func_end_label = alloc_label(ctx); if(!ctx->func_end_label) return E_OUTOFMEMORY; break; case FUNC_SUB: + case FUNC_DEFSUB: ctx->sub_end_label = alloc_label(ctx); if(!ctx->sub_end_label) return E_OUTOFMEMORY; @@ -1628,7 +1630,9 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d for(funcprop_decl = func_decl; funcprop_decl; funcprop_decl = funcprop_decl->next_prop_func) { switch(funcprop_decl->type) { case FUNC_FUNCTION: + case FUNC_DEFFUNC: case FUNC_SUB: + case FUNC_DEFSUB: case FUNC_PROPGET: case FUNC_DEFGET: invoke_type = VBDISP_CALLGET; @@ -1673,6 +1677,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) class_desc_t *class_desc; dim_decl_t *prop_decl; unsigned i; + BOOL isDefault=FALSE; HRESULT hres; static const WCHAR class_initializeW[] = {'c','l','a','s','s','_','i','n','i','t','i','a','l','i','z','e',0}; @@ -1695,11 +1700,18 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) class_desc->func_cnt = 1; /* always allocate slot for default getter */ for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { - for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) - break; + isDefault = FALSE; + if(func_decl->type == FUNC_DEFFUNC || func_decl->type == FUNC_DEFSUB) { + isDefault = TRUE; + } else { + for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { + if(func_prop_decl->type == FUNC_DEFGET) { + isDefault = TRUE; + break; + } + } } - if(!func_prop_decl) + if(isDefault != TRUE) class_desc->func_cnt++; } @@ -1709,10 +1721,17 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) memset(class_desc->funcs, 0, class_desc->func_cnt*sizeof(*class_desc->funcs)); for(func_decl = class_decl->funcs, i=1; func_decl; func_decl = func_decl->next, i++) { - for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) { - i--; - break; + isDefault = FALSE; + if(func_decl->type == FUNC_DEFFUNC || func_decl->type == FUNC_DEFSUB) { + i--; + isDefault = TRUE; + } else { + for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { + if(func_prop_decl->type == FUNC_DEFGET) { + i--; + isDefault = TRUE; + break; + } } } @@ -1732,7 +1751,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) class_desc->class_terminate_id = i; } - hres = create_class_funcprop(ctx, func_decl, class_desc->funcs + (func_prop_decl ? 0 : i)); + hres = create_class_funcprop(ctx, func_decl, class_desc->funcs + (isDefault ? 0 : i)); if(FAILED(hres)) return hres; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d58e89b7dba..51395f3c690 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -134,7 +134,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) + if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_DEFFUNC || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) && !wcsicmp(name, ctx->func->name)) { ref->type = REF_VAR; ref->u.v = &ctx->ret_val; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index cf94bdce464..9471f54bc2f 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -994,6 +994,10 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, if(storage_flags & STORAGE_IS_DEFAULT) { if(type == FUNC_PROPGET) { type = FUNC_DEFGET; + }else if(type == FUNC_FUNCTION) { + type = FUNC_DEFFUNC; + }else if(type == FUNC_SUB) { + type = FUNC_DEFSUB; }else { FIXME("Invalid default property\n"); ctx->hres = E_FAIL; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index fc762450a3b..3250f889808 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1750,6 +1750,37 @@ call ok(x.getprop.getprop().prop is obj, "x.getprop.getprop().prop is not obj (e ok getVT(x) = "VT_DISPATCH*", "getVT(x) = " & getVT(x) todo_wine_ok getVT(x()) = "VT_BSTR", "getVT(x()) = " & getVT(x()) + +funcCalled = "" +class DefaultSubTest1 + Public default Sub init(a) + funcCalled = "init" & a + end sub +end class + +Set obj = New DefaultSubTest1 +obj.init(1) +call ok(funcCalled = "init1","funcCalled=" & funcCalled) +funcCalled = "" +obj(2) +call ok(funcCalled = "init2","funcCalled=" & funcCalled) + +class DefaultSubTest2 + Public Default Function init + funcCalled = "init" + end function +end class + +Set obj = New DefaultSubTest2 +funcCalled = "" +obj.init() +call ok(funcCalled = "init","funcCalled=" & funcCalled) +funcCalled = "" +' todo this is not yet supported +'funcCalled = "" +'obj() +'call ok(funcCalled = "init","funcCalled=" & funcCalled) + with nothing end with diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 36eba21e279..5178949e956 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -38,7 +38,7 @@ static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, vbdisp_invoke_type_t { unsigned i; - for(i = invoke_type == VBDISP_ANY ? 0 : 1; i < This->desc->func_cnt; i++) { + for(i = 0; i < This->desc->func_cnt; i++) { if(invoke_type == VBDISP_ANY) { if(!search_private && !This->desc->funcs[i].is_public) continue; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 869fb05b6ed..1f4132b1898 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -314,7 +314,9 @@ typedef enum { FUNC_PROPGET, FUNC_PROPLET, FUNC_PROPSET, - FUNC_DEFGET + FUNC_DEFGET, + FUNC_DEFFUNC, + FUNC_DEFSUB } function_type_t; typedef struct { -- 2.26.2

2 2

[PATCH 6/6] conhost: Import menu handling from wineconsole.
by Jacek Caban 09 Oct '20

09 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/window.c | 85 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+)

1 0

[PATCH 5/6] conhost: Import config dialog from wineconsole.
by Jacek Caban 09 Oct '20

09 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/Makefile.in | 1 + programs/conhost/conhost.h | 39 ++ programs/conhost/conhost.rc | 82 ++++ programs/conhost/window.c | 849 +++++++++++++++++++++++++++++++++++ 4 files changed, 971 insertions(+)

1 0

[PATCH 4/6] conhost: Import mouse event handling from wineconsole.
by Jacek Caban 09 Oct '20

09 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/window.c | 146 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+)

1 0

[PATCH 3/6] conhost: Import keyboard event handling from wineconsole.
by Jacek Caban 09 Oct '20

09 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 4 +- programs/conhost/conhost.h | 2 + programs/conhost/window.c | 267 +++++++++++++++++++++++++++++++++++++ 3 files changed, 271 insertions(+), 2 deletions(-)

1 0

[PATCH 2/6] conhost: Import menus from wineconsole.
by Jacek Caban 09 Oct '20

09 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.h | 21 +++++++++++++++++ programs/conhost/conhost.rc | 30 +++++++++++++++++++++++++ programs/conhost/window.c | 45 +++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+)

1 0

[PATCH 1/6] conhost: Rename version.rc to conhost.rc.
by Jacek Caban 09 Oct '20

09 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/Makefile.in | 2 +- programs/conhost/{version.rc => conhost.rc} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename programs/conhost/{version.rc => conhost.rc} (100%)

1 0

[PATCH] nls: Build codepage data for CP708.
by Nikolay Sivov 09 Oct '20

09 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Mentioned as missing in https://bugs.winehq.org/show_bug.cgi?id=39298, current Windows 10 provides it. dlls/kernelbase/kernelbase.rgs | 1 + nls/c_708.nls | Bin 0 -> 66082 bytes tools/make_unicode | 1 + 3 files changed, 2 insertions(+) create mode 100644 nls/c_708.nls diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index 82a3cecb3c1..629f98ebafa 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -13,6 +13,7 @@ HKLM val '37' = s 'c_037.nls' val '437' = s 'c_437.nls' val '500' = s 'c_500.nls' + val '708' = s 'c_708.nls' val '737' = s 'c_737.nls' val '775' = s 'c_775.nls' val '850' = s 'c_850.nls' diff --git a/nls/c_708.nls b/nls/c_708.nls new file mode 100644 index 0000000000000000000000000000000000000000..bfab7c9538aa3cb0ca8ec6619741cd80edfec1fc GIT binary patch literal 66082 zcmeIwXK<879LMor0xT``-dmO$dg$e$B=nMm-b3%bcT`kVREm|ZV8yQ3u%!`t?>0IK zfdmls5EVBNGw?!(S2E*#zc+jT-MO86Za#B46zlINFYTo}%HSvY$zK_iQJG|vSy_}- z*_2%Y%AuUfrQFJ+yvnEiDxiWYq{1qqqAI51Dxs1prP3;+vMQ%QS(R4>Ra7NaRuu)Q zs;a5FYN)1askVYuM|D+C_0>QP)kuxiL`~f<YNqCDp_U3!s9LGD+NiDCsl7U=qdKXx z!W6Cubx~J!Q+M@HPxVr7^-*8-Q-2Lmqy}n`25X3hYM6#=ghpzVMr(}5YMjPvf+lK` zCTohOYMQ2NhGuG(W^0b-YM$oH-v-)5ozg&iLWAsiT~Lw|l%iyHx83Yu8*Y2pe)gLB z+CKJ%t}D0AZ&zrgR%x}?Xsx1r!8XViw;Lqe*!H&rY;W7uj<f-0nBAz&T56Zs<u=lW z*)evw9bt#qp|+PTW_sEP+r^eLqiq>e)|4}W#+ve`f~jaKnaZY$2{KhpHB;TxFf~mr zQ`-caI;O6vXX={<rlDD67uv;kiCtiundYX2X=y@CsA*+dn>MDcX=mD-4yL2&WICHL z6K*0*v@gaN>x=Vk@x}W_*}^u!Zqj<Kv+Mr;FZlUq$e77w&XP4-_JABYbLGyHH(&k& z1q&4}QnXm{5+zHOE>pH#pe<jaVx`Jef~r=lUZZBM+QD_|)~ny3VWY-PntIKew`ds> z+NyP%w(Z(?=-8=qSa?L2uHCx#=-I1xpT7P24~QH%Xz-As!-kI-IcoHnvE#;1m^f+j zl&RCE&zL!D_MEx%=6nCxij}KYuUUK3^ZwXy`_4P*SAV~?dpG_3FPn$Ghf+U%^zjE5 zJ?43fpGZ9{PknpddoFbl0tg_0fakq+H^OFj{Mw6(j){%i62EoZ_8mKS?cTF@-~Iy! z4;?;o^w{xRw@;irb^6TNbLSHhFC<;Ol$>(;%GJBSg%bh@Ab<b@2q1s}0tg_000Iag zfB*srAb<b@2q1s}0tg_000RGkz$@N@^rzf#yBFMg(XHRyTJKhB58NK!%W3nawE1e< zymNfC<jb$#eCo-iUwr<?v(GGh?ez~AKJxUZpS}I@CmXMSv+2%@Y5O1D{LZa!-TL0G zAKrWa12@w9GkwPf0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~ z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0 z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{ z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL zKmY**5I_I{1Q0;rz6h-Q>Dte~{OY?e&*q^BAb<b@_biZ<bkV!yB`2q(T)uqe%GIk; z(a|w6v9WP+TU_z+TV30>ZFlW(?R4#O?RM?ivv=>lef#$xa2<3VavgRZaUFFXa~*e` ebe(dYcAasZb)9pacO@hwCSGve^RNB?U;GQ{mG*xC literal 0 HcmV?d00001 diff --git a/tools/make_unicode b/tools/make_unicode index e18ec0a206f..7aae54ccbb3 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -44,6 +44,7 @@ my @allfiles = "CodpageFiles/037.txt", "CodpageFiles/437.txt", "CodpageFiles/500.txt", + "CodpageFiles/708.txt", "CodpageFiles/737.txt", "CodpageFiles/775.txt", "CodpageFiles/850.txt", -- 2.28.0

2 1

[PATCH] include: Update d3d12sdklayers.idl from vkd3d.
by Henri Verbeet 09 Oct '20

09 Oct '20

This corresponds to vkd3d as of commit 4eadd917c7cdbbcdf802a3475cdbc05aab7eaf77. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/d3d12sdklayers.idl | 956 +++++++++++++++++++++++++++++++++++++ 1 file changed, 956 insertions(+) diff --git a/include/d3d12sdklayers.idl b/include/d3d12sdklayers.idl index 50103f3b35d..59b67ebe830 100644 --- a/include/d3d12sdklayers.idl +++ b/include/d3d12sdklayers.idl @@ -18,6 +18,916 @@ import "d3d12.idl"; +cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") +cpp_quote("#undef GetMessage") +cpp_quote("#endif") + +typedef enum D3D12_MESSAGE_CATEGORY +{ + D3D12_MESSAGE_CATEGORY_APPLICATION_DEFINED = 0x0, + D3D12_MESSAGE_CATEGORY_MISCELLANEOUS = 0x1, + D3D12_MESSAGE_CATEGORY_INITIALIZATION = 0x2, + D3D12_MESSAGE_CATEGORY_CLEANUP = 0x3, + D3D12_MESSAGE_CATEGORY_COMPILATION = 0x4, + D3D12_MESSAGE_CATEGORY_STATE_CREATION = 0x5, + D3D12_MESSAGE_CATEGORY_STATE_SETTING = 0x6, + D3D12_MESSAGE_CATEGORY_STATE_GETTING = 0x7, + D3D12_MESSAGE_CATEGORY_RESOURCE_MANIPULATION = 0x8, + D3D12_MESSAGE_CATEGORY_EXECUTION = 0x9, + D3D12_MESSAGE_CATEGORY_SHADER = 0xa, +} D3D12_MESSAGE_CATEGORY; + +typedef enum D3D12_MESSAGE_SEVERITY +{ + D3D12_MESSAGE_SEVERITY_CORRUPTION = 0x0, + D3D12_MESSAGE_SEVERITY_ERROR = 0x1, + D3D12_MESSAGE_SEVERITY_WARNING = 0x2, + D3D12_MESSAGE_SEVERITY_INFO = 0x3, + D3D12_MESSAGE_SEVERITY_MESSAGE = 0x4, +} D3D12_MESSAGE_SEVERITY; + +typedef enum D3D12_MESSAGE_ID +{ + D3D12_MESSAGE_ID_UNKNOWN = 0x0000, + D3D12_MESSAGE_ID_STRING_FROM_APPLICATION = 0x0001, + D3D12_MESSAGE_ID_CORRUPTED_THIS = 0x0002, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER1 = 0x0003, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER2 = 0x0004, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER3 = 0x0005, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER4 = 0x0006, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER5 = 0x0007, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER6 = 0x0008, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER7 = 0x0009, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER8 = 0x000a, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER9 = 0x000b, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER10 = 0x000c, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER11 = 0x000d, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER12 = 0x000e, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER13 = 0x000f, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER14 = 0x0010, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER15 = 0x0011, + D3D12_MESSAGE_ID_CORRUPTED_MULTITHREADING = 0x0012, + D3D12_MESSAGE_ID_MESSAGE_REPORTING_OUTOFMEMORY = 0x0013, + D3D12_MESSAGE_ID_GETPRIVATEDATA_MOREDATA = 0x0014, + D3D12_MESSAGE_ID_SETPRIVATEDATA_INVALIDFREEDATA = 0x0015, + D3D12_MESSAGE_ID_SETPRIVATEDATA_CHANGINGPARAMS = 0x0018, + D3D12_MESSAGE_ID_SETPRIVATEDATA_OUTOFMEMORY = 0x0019, + D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_UNRECOGNIZEDFORMAT = 0x001a, + D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDDESC = 0x001b, + D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDFORMAT = 0x001c, + D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDVIDEOPLANESLICE = 0x001d, + D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDPLANESLICE = 0x001e, + D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDDIMENSIONS = 0x001f, + D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDRESOURCE = 0x0020, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_UNRECOGNIZEDFORMAT = 0x0023, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_UNSUPPORTEDFORMAT = 0x0024, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDDESC = 0x0025, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDFORMAT = 0x0026, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDVIDEOPLANESLICE = 0x0027, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDPLANESLICE = 0x0028, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDDIMENSIONS = 0x0029, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDRESOURCE = 0x002a, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_UNRECOGNIZEDFORMAT = 0x002d, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDDESC = 0x002e, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDFORMAT = 0x002f, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDDIMENSIONS = 0x0030, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDRESOURCE = 0x0031, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_OUTOFMEMORY = 0x0034, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_TOOMANYELEMENTS = 0x0035, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDFORMAT = 0x0036, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INCOMPATIBLEFORMAT = 0x0037, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDSLOT = 0x0038, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDINPUTSLOTCLASS = 0x0039, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_STEPRATESLOTCLASSMISMATCH = 0x003a, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDSLOTCLASSCHANGE = 0x003b, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDSTEPRATECHANGE = 0x003c, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDALIGNMENT = 0x003d, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_DUPLICATESEMANTIC = 0x003e, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_UNPARSEABLEINPUTSIGNATURE = 0x003f, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_NULLSEMANTIC = 0x0040, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_MISSINGELEMENT = 0x0041, + D3D12_MESSAGE_ID_CREATEVERTEXSHADER_OUTOFMEMORY = 0x0042, + D3D12_MESSAGE_ID_CREATEVERTEXSHADER_INVALIDSHADERBYTECODE = 0x0043, + D3D12_MESSAGE_ID_CREATEVERTEXSHADER_INVALIDSHADERTYPE = 0x0044, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_OUTOFMEMORY = 0x0045, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_INVALIDSHADERBYTECODE = 0x0046, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_INVALIDSHADERTYPE = 0x0047, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_OUTOFMEMORY = 0x0048, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSHADERBYTECODE = 0x0049, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSHADERTYPE = 0x004a, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDNUMENTRIES = 0x004b, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_OUTPUTSTREAMSTRIDEUNUSED = 0x004c, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_OUTPUTSLOT0EXPECTED = 0x004f, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDOUTPUTSLOT = 0x0050, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_ONLYONEELEMENTPERSLOT = 0x0051, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDCOMPONENTCOUNT = 0x0052, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSTARTCOMPONENTANDCOMPONENTCOUNT = 0x0053, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDGAPDEFINITION = 0x0054, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_REPEATEDOUTPUT = 0x0055, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDOUTPUTSTREAMSTRIDE = 0x0056, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_MISSINGSEMANTIC = 0x0057, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_MASKMISMATCH = 0x0058, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_CANTHAVEONLYGAPS = 0x0059, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_DECLTOOCOMPLEX = 0x005a, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_MISSINGOUTPUTSIGNATURE = 0x005b, + D3D12_MESSAGE_ID_CREATEPIXELSHADER_OUTOFMEMORY = 0x005c, + D3D12_MESSAGE_ID_CREATEPIXELSHADER_INVALIDSHADERBYTECODE = 0x005d, + D3D12_MESSAGE_ID_CREATEPIXELSHADER_INVALIDSHADERTYPE = 0x005e, + D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDFILLMODE = 0x005f, + D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDCULLMODE = 0x0060, + D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDDEPTHBIASCLAMP = 0x0061, + D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDSLOPESCALEDDEPTHBIAS = 0x0062, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDDEPTHWRITEMASK = 0x0064, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDDEPTHFUNC = 0x0065, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILFAILOP = 0x0066, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILZFAILOP = 0x0067, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILPASSOP = 0x0068, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILFUNC = 0x0069, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILFAILOP = 0x006a, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILZFAILOP = 0x006b, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILPASSOP = 0x006c, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILFUNC = 0x006d, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDSRCBLEND = 0x006f, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDDESTBLEND = 0x0070, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDBLENDOP = 0x0071, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDSRCBLENDALPHA = 0x0072, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDDESTBLENDALPHA = 0x0073, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDBLENDOPALPHA = 0x0074, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDRENDERTARGETWRITEMASK = 0x0075, + D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_INVALID = 0x0087, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_ROOT_SIGNATURE_NOT_SET = 0x00c8, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_ROOT_SIGNATURE_MISMATCH = 0x00c9, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_BUFFER_NOT_SET = 0x00ca, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_BUFFER_STRIDE_TOO_SMALL = 0x00d1, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_BUFFER_TOO_SMALL = 0x00d2, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_BUFFER_NOT_SET = 0x00d3, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_BUFFER_FORMAT_INVALID = 0x00d4, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_BUFFER_TOO_SMALL = 0x00d5, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INVALID_PRIMITIVETOPOLOGY = 0x00db, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_STRIDE_UNALIGNED = 0x00dd, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_OFFSET_UNALIGNED = 0x00de, + D3D12_MESSAGE_ID_DEVICE_REMOVAL_PROCESS_AT_FAULT = 0x00e8, + D3D12_MESSAGE_ID_DEVICE_REMOVAL_PROCESS_POSSIBLY_AT_FAULT = 0x00e9, + D3D12_MESSAGE_ID_DEVICE_REMOVAL_PROCESS_NOT_AT_FAULT = 0x00ea, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_TRAILING_DIGIT_IN_SEMANTIC = 0x00ef, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_TRAILING_DIGIT_IN_SEMANTIC = 0x00f0, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_TYPE_MISMATCH = 0x00f5, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_EMPTY_LAYOUT = 0x00fd, + D3D12_MESSAGE_ID_LIVE_OBJECT_SUMMARY = 0x00ff, + D3D12_MESSAGE_ID_LIVE_DEVICE = 0x0112, + D3D12_MESSAGE_ID_LIVE_SWAPCHAIN = 0x0113, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDFLAGS = 0x0114, + D3D12_MESSAGE_ID_CREATEVERTEXSHADER_INVALIDCLASSLINKAGE = 0x0115, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_INVALIDCLASSLINKAGE = 0x0116, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSTREAMTORASTERIZER = 0x0118, + D3D12_MESSAGE_ID_CREATEPIXELSHADER_INVALIDCLASSLINKAGE = 0x011b, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSTREAM = 0x011c, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UNEXPECTEDENTRIES = 0x011d, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UNEXPECTEDSTRIDES = 0x011e, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDNUMSTRIDES = 0x011f, + D3D12_MESSAGE_ID_CREATEHULLSHADER_OUTOFMEMORY = 0x0121, + D3D12_MESSAGE_ID_CREATEHULLSHADER_INVALIDSHADERBYTECODE = 0x0122, + D3D12_MESSAGE_ID_CREATEHULLSHADER_INVALIDSHADERTYPE = 0x0123, + D3D12_MESSAGE_ID_CREATEHULLSHADER_INVALIDCLASSLINKAGE = 0x0124, + D3D12_MESSAGE_ID_CREATEDOMAINSHADER_OUTOFMEMORY = 0x0126, + D3D12_MESSAGE_ID_CREATEDOMAINSHADER_INVALIDSHADERBYTECODE = 0x0127, + D3D12_MESSAGE_ID_CREATEDOMAINSHADER_INVALIDSHADERTYPE = 0x0128, + D3D12_MESSAGE_ID_CREATEDOMAINSHADER_INVALIDCLASSLINKAGE = 0x0129, + D3D12_MESSAGE_ID_RESOURCE_UNMAP_NOTMAPPED = 0x0136, + D3D12_MESSAGE_ID_DEVICE_CHECKFEATURESUPPORT_MISMATCHED_DATA_SIZE = 0x013e, + D3D12_MESSAGE_ID_CREATECOMPUTESHADER_OUTOFMEMORY = 0x0141, + D3D12_MESSAGE_ID_CREATECOMPUTESHADER_INVALIDSHADERBYTECODE = 0x0142, + D3D12_MESSAGE_ID_CREATECOMPUTESHADER_INVALIDCLASSLINKAGE = 0x0143, + D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 0x014b, + D3D12_MESSAGE_ID_DEVICE_CREATEHULLSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 0x014c, + D3D12_MESSAGE_ID_DEVICE_CREATEDOMAINSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 0x014d, + D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 0x014e, + D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_DOUBLEFLOATOPSNOTSUPPORTED = 0x014f, + D3D12_MESSAGE_ID_DEVICE_CREATEPIXELSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 0x0150, + D3D12_MESSAGE_ID_DEVICE_CREATECOMPUTESHADER_DOUBLEFLOATOPSNOTSUPPORTED = 0x0151, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDRESOURCE = 0x0154, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDDESC = 0x0155, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDFORMAT = 0x0156, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDVIDEOPLANESLICE = 0x0157, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDPLANESLICE = 0x0158, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDDIMENSIONS = 0x0159, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_UNRECOGNIZEDFORMAT = 0x015a, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDFLAGS = 0x0162, + D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDFORCEDSAMPLECOUNT = 0x0191, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDLOGICOPS = 0x0193, + D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 0x019a, + D3D12_MESSAGE_ID_DEVICE_CREATEHULLSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 0x019c, + D3D12_MESSAGE_ID_DEVICE_CREATEDOMAINSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 0x019e, + D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 0x01a0, + D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_DOUBLEEXTENSIONSNOTSUPPORTED = 0x01a2, + D3D12_MESSAGE_ID_DEVICE_CREATEPIXELSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 0x01a4, + D3D12_MESSAGE_ID_DEVICE_CREATECOMPUTESHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 0x01a6, + D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_UAVSNOTSUPPORTED = 0x01a9, + D3D12_MESSAGE_ID_DEVICE_CREATEHULLSHADER_UAVSNOTSUPPORTED = 0x01aa, + D3D12_MESSAGE_ID_DEVICE_CREATEDOMAINSHADER_UAVSNOTSUPPORTED = 0x01ab, + D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADER_UAVSNOTSUPPORTED = 0x01ac, + D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UAVSNOTSUPPORTED = 0x01ad, + D3D12_MESSAGE_ID_DEVICE_CREATEPIXELSHADER_UAVSNOTSUPPORTED = 0x01ae, + D3D12_MESSAGE_ID_DEVICE_CREATECOMPUTESHADER_UAVSNOTSUPPORTED = 0x01af, + D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_INVALIDSOURCERECT = 0x01bf, + D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_EMPTYRECT = 0x01c0, + D3D12_MESSAGE_ID_UPDATETILEMAPPINGS_INVALID_PARAMETER = 0x01ed, + D3D12_MESSAGE_ID_COPYTILEMAPPINGS_INVALID_PARAMETER = 0x01ee, + D3D12_MESSAGE_ID_CREATEDEVICE_INVALIDARGS = 0x01fa, + D3D12_MESSAGE_ID_CREATEDEVICE_WARNING = 0x01fb, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_TYPE = 0x0207, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_NULL_POINTER = 0x0208, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_SUBRESOURCE = 0x0209, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_RESERVED_BITS = 0x020a, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISSING_BIND_FLAGS = 0x020b, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISMATCHING_MISC_FLAGS = 0x020c, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_MATCHING_STATES = 0x020d, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_COMBINATION = 0x020e, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_BEFORE_AFTER_MISMATCH = 0x020f, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_RESOURCE = 0x0210, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_SAMPLE_COUNT = 0x0211, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_FLAGS = 0x0212, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_COMBINED_FLAGS = 0x0213, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_FLAGS_FOR_FORMAT = 0x0214, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_SPLIT_BARRIER = 0x0215, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_UNMATCHED_END = 0x0216, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_UNMATCHED_BEGIN = 0x0217, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_FLAG = 0x0218, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_COMMAND_LIST_TYPE = 0x0219, + D3D12_MESSAGE_ID_INVALID_SUBRESOURCE_STATE = 0x021a, + D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_CONTENTION = 0x021c, + D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_RESET = 0x021d, + D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_RESET_BUNDLE = 0x021e, + D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_CANNOT_RESET = 0x021f, + D3D12_MESSAGE_ID_COMMAND_LIST_OPEN = 0x0220, + D3D12_MESSAGE_ID_INVALID_BUNDLE_API = 0x0222, + D3D12_MESSAGE_ID_COMMAND_LIST_CLOSED = 0x0223, + D3D12_MESSAGE_ID_WRONG_COMMAND_ALLOCATOR_TYPE = 0x0225, + D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_SYNC = 0x0228, + D3D12_MESSAGE_ID_COMMAND_LIST_SYNC = 0x0229, + D3D12_MESSAGE_ID_SET_DESCRIPTOR_HEAP_INVALID = 0x022a, + D3D12_MESSAGE_ID_CREATE_COMMANDQUEUE = 0x022d, + D3D12_MESSAGE_ID_CREATE_COMMANDALLOCATOR = 0x022e, + D3D12_MESSAGE_ID_CREATE_PIPELINESTATE = 0x022f, + D3D12_MESSAGE_ID_CREATE_COMMANDLIST12 = 0x0230, + D3D12_MESSAGE_ID_CREATE_RESOURCE = 0x0232, + D3D12_MESSAGE_ID_CREATE_DESCRIPTORHEAP = 0x0233, + D3D12_MESSAGE_ID_CREATE_ROOTSIGNATURE = 0x0234, + D3D12_MESSAGE_ID_CREATE_LIBRARY = 0x0235, + D3D12_MESSAGE_ID_CREATE_HEAP = 0x0236, + D3D12_MESSAGE_ID_CREATE_MONITOREDFENCE = 0x0237, + D3D12_MESSAGE_ID_CREATE_QUERYHEAP = 0x0238, + D3D12_MESSAGE_ID_CREATE_COMMANDSIGNATURE = 0x0239, + D3D12_MESSAGE_ID_LIVE_COMMANDQUEUE = 0x023a, + D3D12_MESSAGE_ID_LIVE_COMMANDALLOCATOR = 0x023b, + D3D12_MESSAGE_ID_LIVE_PIPELINESTATE = 0x023c, + D3D12_MESSAGE_ID_LIVE_COMMANDLIST12 = 0x023d, + D3D12_MESSAGE_ID_LIVE_RESOURCE = 0x023f, + D3D12_MESSAGE_ID_LIVE_DESCRIPTORHEAP = 0x0240, + D3D12_MESSAGE_ID_LIVE_ROOTSIGNATURE = 0x0241, + D3D12_MESSAGE_ID_LIVE_LIBRARY = 0x0242, + D3D12_MESSAGE_ID_LIVE_HEAP = 0x0243, + D3D12_MESSAGE_ID_LIVE_MONITOREDFENCE = 0x0244, + D3D12_MESSAGE_ID_LIVE_QUERYHEAP = 0x0245, + D3D12_MESSAGE_ID_LIVE_COMMANDSIGNATURE = 0x0246, + D3D12_MESSAGE_ID_DESTROY_COMMANDQUEUE = 0x0247, + D3D12_MESSAGE_ID_DESTROY_COMMANDALLOCATOR = 0x0248, + D3D12_MESSAGE_ID_DESTROY_PIPELINESTATE = 0x0249, + D3D12_MESSAGE_ID_DESTROY_COMMANDLIST12 = 0x024a, + D3D12_MESSAGE_ID_DESTROY_RESOURCE = 0x024c, + D3D12_MESSAGE_ID_DESTROY_DESCRIPTORHEAP = 0x024d, + D3D12_MESSAGE_ID_DESTROY_ROOTSIGNATURE = 0x024e, + D3D12_MESSAGE_ID_DESTROY_LIBRARY = 0x024f, + D3D12_MESSAGE_ID_DESTROY_HEAP = 0x0250, + D3D12_MESSAGE_ID_DESTROY_MONITOREDFENCE = 0x0251, + D3D12_MESSAGE_ID_DESTROY_QUERYHEAP = 0x0252, + D3D12_MESSAGE_ID_DESTROY_COMMANDSIGNATURE = 0x0253, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDDIMENSIONS = 0x0255, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDMISCFLAGS = 0x0257, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDARG_RETURN = 0x025a, + D3D12_MESSAGE_ID_CREATERESOURCE_OUTOFMEMORY_RETURN = 0x025b, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDDESC = 0x025c, + D3D12_MESSAGE_ID_POSSIBLY_INVALID_SUBRESOURCE_STATE = 0x025f, + D3D12_MESSAGE_ID_INVALID_USE_OF_NON_RESIDENT_RESOURCE = 0x0260, + D3D12_MESSAGE_ID_POSSIBLE_INVALID_USE_OF_NON_RESIDENT_RESOURCE = 0x0261, + D3D12_MESSAGE_ID_BUNDLE_PIPELINE_STATE_MISMATCH = 0x0262, + D3D12_MESSAGE_ID_PRIMITIVE_TOPOLOGY_MISMATCH_PIPELINE_STATE = 0x0263, + D3D12_MESSAGE_ID_RENDER_TARGET_FORMAT_MISMATCH_PIPELINE_STATE = 0x0265, + D3D12_MESSAGE_ID_RENDER_TARGET_SAMPLE_DESC_MISMATCH_PIPELINE_STATE = 0x0266, + D3D12_MESSAGE_ID_DEPTH_STENCIL_FORMAT_MISMATCH_PIPELINE_STATE = 0x0267, + D3D12_MESSAGE_ID_DEPTH_STENCIL_SAMPLE_DESC_MISMATCH_PIPELINE_STATE = 0x0268, + D3D12_MESSAGE_ID_CREATESHADER_INVALIDBYTECODE = 0x026e, + D3D12_MESSAGE_ID_CREATEHEAP_NULLDESC = 0x026f, + D3D12_MESSAGE_ID_CREATEHEAP_INVALIDSIZE = 0x0270, + D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDHEAPTYPE = 0x0271, + D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDCPUPAGEPROPERTIES = 0x0272, + D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDMEMORYPOOL = 0x0273, + D3D12_MESSAGE_ID_CREATEHEAP_INVALIDPROPERTIES = 0x0274, + D3D12_MESSAGE_ID_CREATEHEAP_INVALIDALIGNMENT = 0x0275, + D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDMISCFLAGS = 0x0276, + D3D12_MESSAGE_ID_CREATEHEAP_INVALIDMISCFLAGS = 0x0277, + D3D12_MESSAGE_ID_CREATEHEAP_INVALIDARG_RETURN = 0x0278, + D3D12_MESSAGE_ID_CREATEHEAP_OUTOFMEMORY_RETURN = 0x0279, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_NULLHEAPPROPERTIES = 0x027a, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDHEAPTYPE = 0x027b, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDCPUPAGEPROPERTIES = 0x027c, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDMEMORYPOOL = 0x027d, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_INVALIDHEAPPROPERTIES = 0x027e, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDHEAPMISCFLAGS = 0x027f, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_INVALIDHEAPMISCFLAGS = 0x0280, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_INVALIDARG_RETURN = 0x0281, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_OUTOFMEMORY_RETURN = 0x0282, + D3D12_MESSAGE_ID_GETCUSTOMHEAPPROPERTIES_UNRECOGNIZEDHEAPTYPE = 0x0283, + D3D12_MESSAGE_ID_GETCUSTOMHEAPPROPERTIES_INVALIDHEAPTYPE = 0x0284, + D3D12_MESSAGE_ID_CREATE_DESCRIPTOR_HEAP_INVALID_DESC = 0x0285, + D3D12_MESSAGE_ID_INVALID_DESCRIPTOR_HANDLE = 0x0286, + D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALID_CONSERVATIVERASTERMODE = 0x0287, + D3D12_MESSAGE_ID_CREATE_CONSTANT_BUFFER_VIEW_INVALID_RESOURCE = 0x0289, + D3D12_MESSAGE_ID_CREATE_CONSTANT_BUFFER_VIEW_INVALID_DESC = 0x028a, + D3D12_MESSAGE_ID_CREATE_UNORDEREDACCESS_VIEW_INVALID_COUNTER_USAGE = 0x028c, + D3D12_MESSAGE_ID_COPY_DESCRIPTORS_INVALID_RANGES = 0x028d, + D3D12_MESSAGE_ID_COPY_DESCRIPTORS_WRITE_ONLY_DESCRIPTOR = 0x028e, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_RTV_FORMAT_NOT_UNKNOWN = 0x028f, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_RENDER_TARGET_COUNT = 0x0290, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_VERTEX_SHADER_NOT_SET = 0x0291, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INPUTLAYOUT_NOT_SET = 0x0292, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_HS_DS_SIGNATURE_MISMATCH = 0x0293, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_REGISTERINDEX = 0x0294, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_COMPONENTTYPE = 0x0295, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_REGISTERMASK = 0x0296, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_SYSTEMVALUE = 0x0297, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_NEVERWRITTEN_ALWAYSREADS = 0x0298, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_MINPRECISION = 0x0299, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_SEMANTICNAME_NOT_FOUND = 0x029a, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_XOR_DS_MISMATCH = 0x029b, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HULL_SHADER_INPUT_TOPOLOGY_MISMATCH = 0x029c, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_DS_CONTROL_POINT_COUNT_MISMATCH = 0x029d, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_DS_TESSELLATOR_DOMAIN_MISMATCH = 0x029e, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_USE_OF_CENTER_MULTISAMPLE_PATTERN = 0x029f, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_USE_OF_FORCED_SAMPLE_COUNT = 0x02a0, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_PRIMITIVETOPOLOGY = 0x02a1, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_SYSTEMVALUE = 0x02a2, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_OM_DUAL_SOURCE_BLENDING_CAN_ONLY_HAVE_RENDER_TARGET_0 = 0x02a3, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_OM_RENDER_TARGET_DOES_NOT_SUPPORT_BLENDING = 0x02a4, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_PS_OUTPUT_TYPE_MISMATCH = 0x02a5, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_OM_RENDER_TARGET_DOES_NOT_SUPPORT_LOGIC_OPS = 0x02a6, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_RENDERTARGETVIEW_NOT_SET = 0x02a7, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_DEPTHSTENCILVIEW_NOT_SET = 0x02a8, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_GS_INPUT_PRIMITIVE_MISMATCH = 0x02a9, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_POSITION_NOT_PRESENT = 0x02aa, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_MISSING_ROOT_SIGNATURE_FLAGS = 0x02ab, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_INDEX_BUFFER_PROPERTIES = 0x02ac, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_SAMPLE_DESC = 0x02ad, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_ROOT_SIGNATURE_MISMATCH = 0x02ae, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_DS_ROOT_SIGNATURE_MISMATCH = 0x02af, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_VS_ROOT_SIGNATURE_MISMATCH = 0x02b0, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_GS_ROOT_SIGNATURE_MISMATCH = 0x02b1, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_PS_ROOT_SIGNATURE_MISMATCH = 0x02b2, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_MISSING_ROOT_SIGNATURE = 0x02b3, + D3D12_MESSAGE_ID_EXECUTE_BUNDLE_OPEN_BUNDLE = 0x02b4, + D3D12_MESSAGE_ID_EXECUTE_BUNDLE_DESCRIPTOR_HEAP_MISMATCH = 0x02b5, + D3D12_MESSAGE_ID_EXECUTE_BUNDLE_TYPE = 0x02b6, + D3D12_MESSAGE_ID_DRAW_EMPTY_SCISSOR_RECTANGLE = 0x02b7, + D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_BLOB_NOT_FOUND = 0x02b8, + D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_DESERIALIZE_FAILED = 0x02b9, + D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_INVALID_CONFIGURATION = 0x02ba, + D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_NOT_SUPPORTED_ON_DEVICE = 0x02bb, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_NULLRESOURCEPROPERTIES = 0x02bc, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_NULLHEAP = 0x02bd, + D3D12_MESSAGE_ID_GETRESOURCEALLOCATIONINFO_INVALIDRDESCS = 0x02be, + D3D12_MESSAGE_ID_MAKERESIDENT_NULLOBJECTARRAY = 0x02bf, + D3D12_MESSAGE_ID_EVICT_NULLOBJECTARRAY = 0x02c1, + D3D12_MESSAGE_ID_SET_DESCRIPTOR_TABLE_INVALID = 0x02c4, + D3D12_MESSAGE_ID_SET_ROOT_CONSTANT_INVALID = 0x02c5, + D3D12_MESSAGE_ID_SET_ROOT_CONSTANT_BUFFER_VIEW_INVALID = 0x02c6, + D3D12_MESSAGE_ID_SET_ROOT_SHADER_RESOURCE_VIEW_INVALID = 0x02c7, + D3D12_MESSAGE_ID_SET_ROOT_UNORDERED_ACCESS_VIEW_INVALID = 0x02c8, + D3D12_MESSAGE_ID_SET_VERTEX_BUFFERS_INVALID_DESC = 0x02c9, + D3D12_MESSAGE_ID_SET_INDEX_BUFFER_INVALID_DESC = 0x02cb, + D3D12_MESSAGE_ID_SET_STREAM_OUTPUT_BUFFERS_INVALID_DESC = 0x02cd, + D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDDIMENSIONALITY = 0x02ce, + D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDLAYOUT = 0x02cf, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDDIMENSIONALITY = 0x02d0, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDALIGNMENT = 0x02d1, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDMIPLEVELS = 0x02d2, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDSAMPLEDESC = 0x02d3, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDLAYOUT = 0x02d4, + D3D12_MESSAGE_ID_SET_INDEX_BUFFER_INVALID = 0x02d5, + D3D12_MESSAGE_ID_SET_VERTEX_BUFFERS_INVALID = 0x02d6, + D3D12_MESSAGE_ID_SET_STREAM_OUTPUT_BUFFERS_INVALID = 0x02d7, + D3D12_MESSAGE_ID_SET_RENDER_TARGETS_INVALID = 0x02d8, + D3D12_MESSAGE_ID_CREATEQUERY_HEAP_INVALID_PARAMETERS = 0x02d9, + D3D12_MESSAGE_ID_BEGIN_END_QUERY_INVALID_PARAMETERS = 0x02db, + D3D12_MESSAGE_ID_CLOSE_COMMAND_LIST_OPEN_QUERY = 0x02dc, + D3D12_MESSAGE_ID_RESOLVE_QUERY_DATA_INVALID_PARAMETERS = 0x02dd, + D3D12_MESSAGE_ID_SET_PREDICATION_INVALID_PARAMETERS = 0x02de, + D3D12_MESSAGE_ID_TIMESTAMPS_NOT_SUPPORTED = 0x02df, + D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDFORMAT = 0x02e1, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDFORMAT = 0x02e2, + D3D12_MESSAGE_ID_GETCOPYABLEFOOTPRINTS_INVALIDSUBRESOURCERANGE = 0x02e3, + D3D12_MESSAGE_ID_GETCOPYABLEFOOTPRINTS_INVALIDBASEOFFSET = 0x02e4, + D3D12_MESSAGE_ID_GETCOPYABLELAYOUT_INVALIDSUBRESOURCERANGE = 0x02e3, + D3D12_MESSAGE_ID_GETCOPYABLELAYOUT_INVALIDBASEOFFSET = 0x02e4, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_HEAP = 0x02e5, + D3D12_MESSAGE_ID_CREATE_SAMPLER_INVALID = 0x02e6, + D3D12_MESSAGE_ID_CREATECOMMANDSIGNATURE_INVALID = 0x02e7, + D3D12_MESSAGE_ID_EXECUTE_INDIRECT_INVALID_PARAMETERS = 0x02e8, + D3D12_MESSAGE_ID_GETGPUVIRTUALADDRESS_INVALID_RESOURCE_DIMENSION = 0x02e9, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDCLEARVALUE = 0x032f, + D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDCLEARVALUEFORMAT = 0x0330, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDCLEARVALUEFORMAT = 0x0331, + D3D12_MESSAGE_ID_CREATERESOURCE_CLEARVALUEDENORMFLUSH = 0x0332, + D3D12_MESSAGE_ID_CLEARRENDERTARGETVIEW_MISMATCHINGCLEARVALUE = 0x0334, + D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_MISMATCHINGCLEARVALUE = 0x0335, + D3D12_MESSAGE_ID_MAP_INVALIDHEAP = 0x0336, + D3D12_MESSAGE_ID_UNMAP_INVALIDHEAP = 0x0337, + D3D12_MESSAGE_ID_MAP_INVALIDRESOURCE = 0x0338, + D3D12_MESSAGE_ID_UNMAP_INVALIDRESOURCE = 0x0339, + D3D12_MESSAGE_ID_MAP_INVALIDSUBRESOURCE = 0x033a, + D3D12_MESSAGE_ID_UNMAP_INVALIDSUBRESOURCE = 0x033b, + D3D12_MESSAGE_ID_MAP_INVALIDRANGE = 0x033c, + D3D12_MESSAGE_ID_UNMAP_INVALIDRANGE = 0x033d, + D3D12_MESSAGE_ID_MAP_INVALIDDATAPOINTER = 0x0340, + D3D12_MESSAGE_ID_MAP_INVALIDARG_RETURN = 0x0341, + D3D12_MESSAGE_ID_MAP_OUTOFMEMORY_RETURN = 0x0342, + D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_BUNDLENOTSUPPORTED = 0x0343, + D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_COMMANDLISTMISMATCH = 0x0344, + D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_OPENCOMMANDLIST = 0x0345, + D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_FAILEDCOMMANDLIST = 0x0346, + D3D12_MESSAGE_ID_COPYBUFFERREGION_NULLDST = 0x0347, + D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALIDDSTRESOURCEDIMENSION = 0x0348, + D3D12_MESSAGE_ID_COPYBUFFERREGION_DSTRANGEOUTOFBOUNDS = 0x0349, + D3D12_MESSAGE_ID_COPYBUFFERREGION_NULLSRC = 0x034a, + D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALIDSRCRESOURCEDIMENSION = 0x034b, + D3D12_MESSAGE_ID_COPYBUFFERREGION_SRCRANGEOUTOFBOUNDS = 0x034c, + D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALIDCOPYFLAGS = 0x034d, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_NULLDST = 0x034e, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDDSTTYPE = 0x034f, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTRESOURCEDIMENSION = 0x0350, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTRESOURCE = 0x0351, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTSUBRESOURCE = 0x0352, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTOFFSET = 0x0353, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDDSTFORMAT = 0x0354, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTFORMAT = 0x0355, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTDIMENSIONS = 0x0356, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTROWPITCH = 0x0357, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTPLACEMENT = 0x0358, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTDSPLACEDFOOTPRINTFORMAT = 0x0359, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_DSTREGIONOUTOFBOUNDS = 0x035a, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_NULLSRC = 0x035b, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDSRCTYPE = 0x035c, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCRESOURCEDIMENSION = 0x035d, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCRESOURCE = 0x035e, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCSUBRESOURCE = 0x035f, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCOFFSET = 0x0360, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDSRCFORMAT = 0x0361, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCFORMAT = 0x0362, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCDIMENSIONS = 0x0363, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCROWPITCH = 0x0364, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCPLACEMENT = 0x0365, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCDSPLACEDFOOTPRINTFORMAT = 0x0366, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_SRCREGIONOUTOFBOUNDS = 0x0367, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTCOORDINATES = 0x0368, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCBOX = 0x0369, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_FORMATMISMATCH = 0x036a, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_EMPTYBOX = 0x036b, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDCOPYFLAGS = 0x036c, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALID_SUBRESOURCE_INDEX = 0x036d, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALID_FORMAT = 0x036e, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_RESOURCE_MISMATCH = 0x036f, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALID_SAMPLE_COUNT = 0x0370, + D3D12_MESSAGE_ID_CREATECOMPUTEPIPELINESTATE_INVALID_SHADER = 0x0371, + D3D12_MESSAGE_ID_CREATECOMPUTEPIPELINESTATE_CS_ROOT_SIGNATURE_MISMATCH = 0x0372, + D3D12_MESSAGE_ID_CREATECOMPUTEPIPELINESTATE_MISSING_ROOT_SIGNATURE = 0x0373, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_INVALIDCACHEDBLOB = 0x0374, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBADAPTERMISMATCH = 0x0375, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBDRIVERVERSIONMISMATCH = 0x0376, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBDESCMISMATCH = 0x0377, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBIGNORED = 0x0378, + D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDHEAP = 0x0379, + D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDRESOURCE = 0x037a, + D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDBOX = 0x037b, + D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDSUBRESOURCE = 0x037c, + D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_EMPTYBOX = 0x037d, + D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDHEAP = 0x037e, + D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDRESOURCE = 0x037f, + D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDBOX = 0x0380, + D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDSUBRESOURCE = 0x0381, + D3D12_MESSAGE_ID_READFROMSUBRESOURCE_EMPTYBOX = 0x0382, + D3D12_MESSAGE_ID_TOO_MANY_NODES_SPECIFIED = 0x0383, + D3D12_MESSAGE_ID_INVALID_NODE_INDEX = 0x0384, + D3D12_MESSAGE_ID_GETHEAPPROPERTIES_INVALIDRESOURCE = 0x0385, + D3D12_MESSAGE_ID_NODE_MASK_MISMATCH = 0x0386, + D3D12_MESSAGE_ID_COMMAND_LIST_OUTOFMEMORY = 0x0387, + D3D12_MESSAGE_ID_COMMAND_LIST_MULTIPLE_SWAPCHAIN_BUFFER_REFERENCES = 0x0388, + D3D12_MESSAGE_ID_COMMAND_LIST_TOO_MANY_SWAPCHAIN_REFERENCES = 0x0389, + D3D12_MESSAGE_ID_COMMAND_QUEUE_TOO_MANY_SWAPCHAIN_REFERENCES = 0x038a, + D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_WRONGSWAPCHAINBUFFERREFERENCE = 0x038b, + D3D12_MESSAGE_ID_COMMAND_LIST_SETRENDERTARGETS_INVALIDNUMRENDERTARGETS = 0x038c, + D3D12_MESSAGE_ID_CREATE_QUEUE_INVALID_TYPE = 0x038d, + D3D12_MESSAGE_ID_CREATE_QUEUE_INVALID_FLAGS = 0x038e, + D3D12_MESSAGE_ID_CREATESHAREDRESOURCE_INVALIDFLAGS = 0x038f, + D3D12_MESSAGE_ID_CREATESHAREDRESOURCE_INVALIDFORMAT = 0x0390, + D3D12_MESSAGE_ID_CREATESHAREDHEAP_INVALIDFLAGS = 0x0391, + D3D12_MESSAGE_ID_REFLECTSHAREDPROPERTIES_UNRECOGNIZEDPROPERTIES = 0x0392, + D3D12_MESSAGE_ID_REFLECTSHAREDPROPERTIES_INVALIDSIZE = 0x0393, + D3D12_MESSAGE_ID_REFLECTSHAREDPROPERTIES_INVALIDOBJECT = 0x0394, + D3D12_MESSAGE_ID_KEYEDMUTEX_INVALIDOBJECT = 0x0395, + D3D12_MESSAGE_ID_KEYEDMUTEX_INVALIDKEY = 0x0396, + D3D12_MESSAGE_ID_KEYEDMUTEX_WRONGSTATE = 0x0397, + D3D12_MESSAGE_ID_CREATE_QUEUE_INVALID_PRIORITY = 0x0398, + D3D12_MESSAGE_ID_OBJECT_DELETED_WHILE_STILL_IN_USE = 0x0399, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_INVALID_FLAGS = 0x039a, + D3D12_MESSAGE_ID_HEAP_ADDRESS_RANGE_HAS_NO_RESOURCE = 0x039b, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_RENDER_TARGET_DELETED = 0x039c, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_ALL_RENDER_TARGETS_HAVE_UNKNOWN_FORMAT = 0x039d, + D3D12_MESSAGE_ID_HEAP_ADDRESS_RANGE_INTERSECTS_MULTIPLE_BUFFERS = 0x039e, + D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_GPU_WRITTEN_READBACK_RESOURCE_MAPPED = 0x039f, + D3D12_MESSAGE_ID_UNMAP_RANGE_NOT_EMPTY = 0x03a1, + D3D12_MESSAGE_ID_MAP_INVALID_NULLRANGE = 0x03a2, + D3D12_MESSAGE_ID_UNMAP_INVALID_NULLRANGE = 0x03a3, + D3D12_MESSAGE_ID_NO_GRAPHICS_API_SUPPORT = 0x03a4, + D3D12_MESSAGE_ID_NO_COMPUTE_API_SUPPORT = 0x03a5, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_RESOURCE_FLAGS_NOT_SUPPORTED = 0x03a6, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_ROOT_ARGUMENT_UNINITIALIZED = 0x03a7, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_HEAP_INDEX_OUT_OF_BOUNDS = 0x03a8, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_TABLE_REGISTER_INDEX_OUT_OF_BOUNDS = 0x03a9, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_UNINITIALIZED = 0x03aa, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_TYPE_MISMATCH = 0x03ab, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_SRV_RESOURCE_DIMENSION_MISMATCH = 0x03ac, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_UAV_RESOURCE_DIMENSION_MISMATCH = 0x03ad, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_INCOMPATIBLE_RESOURCE_STATE = 0x03ae, + D3D12_MESSAGE_ID_COPYRESOURCE_NULLDST = 0x03af, + D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDDSTRESOURCE = 0x03b0, + D3D12_MESSAGE_ID_COPYRESOURCE_NULLSRC = 0x03b1, + D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDSRCRESOURCE = 0x03b2, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_NULLDST = 0x03b3, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALIDDSTRESOURCE = 0x03b4, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_NULLSRC = 0x03b5, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALIDSRCRESOURCE = 0x03b6, + D3D12_MESSAGE_ID_PIPELINE_STATE_TYPE_MISMATCH = 0x03b7, + D3D12_MESSAGE_ID_COMMAND_LIST_DISPATCH_ROOT_SIGNATURE_NOT_SET = 0x03b8, + D3D12_MESSAGE_ID_COMMAND_LIST_DISPATCH_ROOT_SIGNATURE_MISMATCH = 0x03b9, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_ZERO_BARRIERS = 0x03ba, + D3D12_MESSAGE_ID_BEGIN_END_EVENT_MISMATCH = 0x03bb, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_POSSIBLE_BEFORE_AFTER_MISMATCH = 0x03bc, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISMATCHING_BEGIN_END = 0x03bd, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_INVALID_RESOURCE = 0x03be, + D3D12_MESSAGE_ID_USE_OF_ZERO_REFCOUNT_OBJECT = 0x03bf, + D3D12_MESSAGE_ID_OBJECT_EVICTED_WHILE_STILL_IN_USE = 0x03c0, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_ROOT_DESCRIPTOR_ACCESS_OUT_OF_BOUNDS = 0x03c1, + D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_INVALIDLIBRARYBLOB = 0x03c2, + D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_DRIVERVERSIONMISMATCH = 0x03c3, + D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_ADAPTERVERSIONMISMATCH = 0x03c4, + D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_UNSUPPORTED = 0x03c5, + D3D12_MESSAGE_ID_CREATE_PIPELINELIBRARY = 0x03c6, + D3D12_MESSAGE_ID_LIVE_PIPELINELIBRARY = 0x03c7, + D3D12_MESSAGE_ID_DESTROY_PIPELINELIBRARY = 0x03c8, + D3D12_MESSAGE_ID_STOREPIPELINE_NONAME = 0x03c9, + D3D12_MESSAGE_ID_STOREPIPELINE_DUPLICATENAME = 0x03ca, + D3D12_MESSAGE_ID_LOADPIPELINE_NAMENOTFOUND = 0x03cb, + D3D12_MESSAGE_ID_LOADPIPELINE_INVALIDDESC = 0x03cc, + D3D12_MESSAGE_ID_PIPELINELIBRARY_SERIALIZE_NOTENOUGHMEMORY = 0x03cd, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_PS_OUTPUT_RT_OUTPUT_MISMATCH = 0x03ce, + D3D12_MESSAGE_ID_SETEVENTONMULTIPLEFENCECOMPLETION_INVALIDFLAGS = 0x03cf, + D3D12_MESSAGE_ID_CREATE_QUEUE_VIDEO_NOT_SUPPORTED = 0x03d0, + D3D12_MESSAGE_ID_CREATE_COMMAND_ALLOCATOR_VIDEO_NOT_SUPPORTED = 0x03d1, + D3D12_MESSAGE_ID_CREATEQUERY_HEAP_VIDEO_DECODE_STATISTICS_NOT_SUPPORTED = 0x03d2, + D3D12_MESSAGE_ID_CREATE_VIDEODECODECOMMANDLIST = 0x03d3, + D3D12_MESSAGE_ID_CREATE_VIDEODECODER = 0x03d4, + D3D12_MESSAGE_ID_CREATE_VIDEODECODESTREAM = 0x03d5, + D3D12_MESSAGE_ID_LIVE_VIDEODECODECOMMANDLIST = 0x03d6, + D3D12_MESSAGE_ID_LIVE_VIDEODECODER = 0x03d7, + D3D12_MESSAGE_ID_LIVE_VIDEODECODESTREAM = 0x03d8, + D3D12_MESSAGE_ID_DESTROY_VIDEODECODECOMMANDLIST = 0x03d9, + D3D12_MESSAGE_ID_DESTROY_VIDEODECODER = 0x03da, + D3D12_MESSAGE_ID_DESTROY_VIDEODECODESTREAM = 0x03db, + D3D12_MESSAGE_ID_DECODE_FRAME_INVALID_PARAMETERS = 0x03dc, + D3D12_MESSAGE_ID_DEPRECATED_API = 0x03dd, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISMATCHING_COMMAND_LIST_TYPE = 0x03de, + D3D12_MESSAGE_ID_COMMAND_LIST_DESCRIPTOR_TABLE_NOT_SET = 0x03df, + D3D12_MESSAGE_ID_COMMAND_LIST_ROOT_CONSTANT_BUFFER_VIEW_NOT_SET = 0x03e0, + D3D12_MESSAGE_ID_COMMAND_LIST_ROOT_SHADER_RESOURCE_VIEW_NOT_SET = 0x03e1, + D3D12_MESSAGE_ID_COMMAND_LIST_ROOT_UNORDERED_ACCESS_VIEW_NOT_SET = 0x03e2, + D3D12_MESSAGE_ID_DISCARD_INVALID_SUBRESOURCE_RANGE = 0x03e3, + D3D12_MESSAGE_ID_DISCARD_ONE_SUBRESOURCE_FOR_MIPS_WITH_RECTS = 0x03e4, + D3D12_MESSAGE_ID_DISCARD_NO_RECTS_FOR_NON_TEXTURE2D = 0x03e5, + D3D12_MESSAGE_ID_COPY_ON_SAME_SUBRESOURCE = 0x03e6, + D3D12_MESSAGE_ID_SETRESIDENCYPRIORITY_INVALID_PAGEABLE = 0x03e7, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_UNSUPPORTED = 0x03e8, + D3D12_MESSAGE_ID_STATIC_DESCRIPTOR_INVALID_DESCRIPTOR_CHANGE = 0x03e9, + D3D12_MESSAGE_ID_DATA_STATIC_DESCRIPTOR_INVALID_DATA_CHANGE = 0x03ea, + D3D12_MESSAGE_ID_DATA_STATIC_WHILE_SET_AT_EXECUTE_DESCRIPTOR_INVALID_DATA_CHANGE = 0x03eb, + D3D12_MESSAGE_ID_EXECUTE_BUNDLE_STATIC_DESCRIPTOR_DATA_STATIC_NOT_SET = 0x03ec, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_RESOURCE_ACCESS_OUT_OF_BOUNDS = 0x03ed, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_SAMPLER_MODE_MISMATCH = 0x03ee, + D3D12_MESSAGE_ID_CREATE_FENCE_INVALID_FLAGS = 0x03ef, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_DUPLICATE_SUBRESOURCE_TRANSITIONS = 0x03f0, + D3D12_MESSAGE_ID_SETRESIDENCYPRIORITY_INVALID_PRIORITY = 0x03f1, + D3D12_MESSAGE_ID_CREATE_DESCRIPTOR_HEAP_LARGE_NUM_DESCRIPTORS = 0x03f5, + D3D12_MESSAGE_ID_BEGIN_EVENT = 0x03f6, + D3D12_MESSAGE_ID_END_EVENT = 0x03f7, + D3D12_MESSAGE_ID_CREATEDEVICE_DEBUG_LAYER_STARTUP_OPTIONS = 0x03f8, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_DEPTHBOUNDSTEST_UNSUPPORTED = 0x03f9, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_DUPLICATE_SUBOBJECT = 0x03fa, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_UNKNOWN_SUBOBJECT = 0x03fb, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_ZERO_SIZE_STREAM = 0x03fc, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_INVALID_STREAM = 0x03fd, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CANNOT_DEDUCE_TYPE = 0x03fe, + D3D12_MESSAGE_ID_COMMAND_LIST_STATIC_DESCRIPTOR_RESOURCE_DIMENSION_MISMATCH = 0x03ff, + D3D12_MESSAGE_ID_CREATE_COMMAND_QUEUE_INSUFFICIENT_PRIVILEGE_FOR_GLOBAL_REALTIME = 0x0400, + D3D12_MESSAGE_ID_CREATE_COMMAND_QUEUE_INSUFFICIENT_HARDWARE_SUPPORT_FOR_GLOBAL_REALTIME = 0x0401, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_ARCHITECTURE = 0x0402, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_DST = 0x0403, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_DST_RESOURCE_DIMENSION = 0x0404, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_DST_RANGE_OUT_OF_BOUNDS = 0x0405, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_SRC = 0x0406, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_SRC_RESOURCE_DIMENSION = 0x0407, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_SRC_RANGE_OUT_OF_BOUNDS = 0x0408, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_OFFSET_ALIGNMENT = 0x0409, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_DEPENDENT_RESOURCES = 0x040a, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_DEPENDENT_SUBRESOURCE_RANGES = 0x040b, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_DEPENDENT_RESOURCE = 0x040c, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_DEPENDENT_SUBRESOURCE_RANGE = 0x040d, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_DEPENDENT_SUBRESOURCE_OUT_OF_BOUNDS = 0x040e, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_DEPENDENT_RANGE_OUT_OF_BOUNDS = 0x040f, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_ZERO_DEPENDENCIES = 0x0410, + D3D12_MESSAGE_ID_DEVICE_CREATE_SHARED_HANDLE_INVALIDARG = 0x0411, + D3D12_MESSAGE_ID_DESCRIPTOR_HANDLE_WITH_INVALID_RESOURCE = 0x0412, + D3D12_MESSAGE_ID_SETDEPTHBOUNDS_INVALIDARGS = 0x0413, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_RESOURCE_STATE_IMPRECISE = 0x0414, + D3D12_MESSAGE_ID_COMMAND_LIST_PIPELINE_STATE_NOT_SET = 0x0415, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_MODEL_MISMATCH = 0x0416, + D3D12_MESSAGE_ID_OBJECT_ACCESSED_WHILE_STILL_IN_USE = 0x0417, + D3D12_MESSAGE_ID_PROGRAMMABLE_MSAA_UNSUPPORTED = 0x0418, + D3D12_MESSAGE_ID_SETSAMPLEPOSITIONS_INVALIDARGS = 0x0419, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCEREGION_INVALID_RECT = 0x041a, + D3D12_MESSAGE_ID_CREATE_VIDEODECODECOMMANDQUEUE = 0x041b, + D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSCOMMANDLIST = 0x041c, + D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSCOMMANDQUEUE = 0x041d, + D3D12_MESSAGE_ID_LIVE_VIDEODECODECOMMANDQUEUE = 0x041e, + D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSCOMMANDLIST = 0x041f, + D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSCOMMANDQUEUE = 0x0420, + D3D12_MESSAGE_ID_DESTROY_VIDEODECODECOMMANDQUEUE = 0x0421, + D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSCOMMANDLIST = 0x0422, + D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSCOMMANDQUEUE = 0x0423, + D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSOR = 0x0424, + D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSSTREAM = 0x0425, + D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSOR = 0x0426, + D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSSTREAM = 0x0427, + D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSOR = 0x0428, + D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSSTREAM = 0x0429, + D3D12_MESSAGE_ID_PROCESS_FRAME_INVALID_PARAMETERS = 0x042a, + D3D12_MESSAGE_ID_COPY_INVALIDLAYOUT = 0x042b, + D3D12_MESSAGE_ID_CREATE_CRYPTO_SESSION = 0x042c, + D3D12_MESSAGE_ID_CREATE_CRYPTO_SESSION_POLICY = 0x042d, + D3D12_MESSAGE_ID_CREATE_PROTECTED_RESOURCE_SESSION = 0x042e, + D3D12_MESSAGE_ID_LIVE_CRYPTO_SESSION = 0x042f, + D3D12_MESSAGE_ID_LIVE_CRYPTO_SESSION_POLICY = 0x0430, + D3D12_MESSAGE_ID_LIVE_PROTECTED_RESOURCE_SESSION = 0x0431, + D3D12_MESSAGE_ID_DESTROY_CRYPTO_SESSION = 0x0432, + D3D12_MESSAGE_ID_DESTROY_CRYPTO_SESSION_POLICY = 0x0433, + D3D12_MESSAGE_ID_DESTROY_PROTECTED_RESOURCE_SESSION = 0x0434, + D3D12_MESSAGE_ID_PROTECTED_RESOURCE_SESSION_UNSUPPORTED = 0x0435, + D3D12_MESSAGE_ID_FENCE_INVALIDOPERATION = 0x0436, + D3D12_MESSAGE_ID_CREATEQUERY_HEAP_COPY_QUEUE_TIMESTAMPS_NOT_SUPPORTED = 0x0437, + D3D12_MESSAGE_ID_SAMPLEPOSITIONS_MISMATCH_DEFERRED = 0x0438, + D3D12_MESSAGE_ID_SAMPLEPOSITIONS_MISMATCH_RECORDTIME_ASSUMEDFROMFIRSTUSE = 0x0439, + D3D12_MESSAGE_ID_SAMPLEPOSITIONS_MISMATCH_RECORDTIME_ASSUMEDFROMCLEAR = 0x043a, + D3D12_MESSAGE_ID_CREATE_VIDEODECODERHEAP = 0x043b, + D3D12_MESSAGE_ID_LIVE_VIDEODECODERHEAP = 0x043c, + D3D12_MESSAGE_ID_DESTROY_VIDEODECODERHEAP = 0x043d, + D3D12_MESSAGE_ID_OPENEXISTINGHEAP_INVALIDARG_RETURN = 0x043e, + D3D12_MESSAGE_ID_OPENEXISTINGHEAP_OUTOFMEMORY_RETURN = 0x043f, + D3D12_MESSAGE_ID_OPENEXISTINGHEAP_INVALIDADDRESS = 0x0440, + D3D12_MESSAGE_ID_OPENEXISTINGHEAP_INVALIDHANDLE = 0x0441, + D3D12_MESSAGE_ID_WRITEBUFFERIMMEDIATE_INVALID_DEST = 0x0442, + D3D12_MESSAGE_ID_WRITEBUFFERIMMEDIATE_INVALID_MODE = 0x0443, + D3D12_MESSAGE_ID_WRITEBUFFERIMMEDIATE_INVALID_ALIGNMENT = 0x0444, + D3D12_MESSAGE_ID_WRITEBUFFERIMMEDIATE_NOT_SUPPORTED = 0x0445, + D3D12_MESSAGE_ID_SETVIEWINSTANCEMASK_INVALIDARGS = 0x0446, + D3D12_MESSAGE_ID_VIEW_INSTANCING_UNSUPPORTED = 0x0447, + D3D12_MESSAGE_ID_VIEW_INSTANCING_INVALIDARGS = 0x0448, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_MISMATCH_DECODE_REFERENCE_ONLY_FLAG = 0x0449, + D3D12_MESSAGE_ID_COPYRESOURCE_MISMATCH_DECODE_REFERENCE_ONLY_FLAG = 0x044a, + D3D12_MESSAGE_ID_CREATE_VIDEO_DECODE_HEAP_CAPS_FAILURE = 0x044b, + D3D12_MESSAGE_ID_CREATE_VIDEO_DECODE_HEAP_CAPS_UNSUPPORTED = 0x044c, + D3D12_MESSAGE_ID_VIDEO_DECODE_SUPPORT_INVALID_INPUT = 0x044d, + D3D12_MESSAGE_ID_CREATE_VIDEO_DECODER_UNSUPPORTED = 0x044e, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_METADATA_ERROR = 0x044f, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_VIEW_INSTANCING_VERTEX_SIZE_EXCEEDED = 0x0450, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_RUNTIME_INTERNAL_ERROR = 0x0451, + D3D12_MESSAGE_ID_NO_VIDEO_API_SUPPORT = 0x0452, + D3D12_MESSAGE_ID_VIDEO_PROCESS_SUPPORT_INVALID_INPUT = 0x0453, + D3D12_MESSAGE_ID_CREATE_VIDEO_PROCESSOR_CAPS_FAILURE = 0x0454, + D3D12_MESSAGE_ID_VIDEO_PROCESS_SUPPORT_UNSUPPORTED_FORMAT = 0x0455, + D3D12_MESSAGE_ID_VIDEO_DECODE_FRAME_INVALID_ARGUMENT = 0x0456, + D3D12_MESSAGE_ID_ENQUEUE_MAKE_RESIDENT_INVALID_FLAGS = 0x0457, + D3D12_MESSAGE_ID_OPENEXISTINGHEAP_UNSUPPORTED = 0x0458, + D3D12_MESSAGE_ID_VIDEO_PROCESS_FRAMES_INVALID_ARGUMENT = 0x0459, + D3D12_MESSAGE_ID_VIDEO_DECODE_SUPPORT_UNSUPPORTED = 0x045a, + D3D12_MESSAGE_ID_CREATE_COMMANDRECORDER = 0x045b, + D3D12_MESSAGE_ID_LIVE_COMMANDRECORDER = 0x045c, + D3D12_MESSAGE_ID_DESTROY_COMMANDRECORDER = 0x045d, + D3D12_MESSAGE_ID_CREATE_COMMAND_RECORDER_VIDEO_NOT_SUPPORTED = 0x045e, + D3D12_MESSAGE_ID_CREATE_COMMAND_RECORDER_INVALID_SUPPORT_FLAGS = 0x045f, + D3D12_MESSAGE_ID_CREATE_COMMAND_RECORDER_INVALID_FLAGS = 0x0460, + D3D12_MESSAGE_ID_CREATE_COMMAND_RECORDER_MORE_RECORDERS_THAN_LOGICAL_PROCESSORS = 0x0461, + D3D12_MESSAGE_ID_CREATE_COMMANDPOOL = 0x0462, + D3D12_MESSAGE_ID_LIVE_COMMANDPOOL = 0x0463, + D3D12_MESSAGE_ID_DESTROY_COMMANDPOOL = 0x0464, + D3D12_MESSAGE_ID_CREATE_COMMAND_POOL_INVALID_FLAGS = 0x0465, + D3D12_MESSAGE_ID_CREATE_COMMAND_LIST_VIDEO_NOT_SUPPORTED = 0x0466, + D3D12_MESSAGE_ID_COMMAND_RECORDER_SUPPORT_FLAGS_MISMATCH = 0x0467, + D3D12_MESSAGE_ID_COMMAND_RECORDER_CONTENTION = 0x0468, + D3D12_MESSAGE_ID_COMMAND_RECORDER_USAGE_WITH_CREATECOMMANDLIST_COMMAND_LIST = 0x0469, + D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_USAGE_WITH_CREATECOMMANDLIST1_COMMAND_LIST = 0x046a, + D3D12_MESSAGE_ID_CANNOT_EXECUTE_EMPTY_COMMAND_LIST = 0x046b, + D3D12_MESSAGE_ID_CANNOT_RESET_COMMAND_POOL_WITH_OPEN_COMMAND_LISTS = 0x046c, + D3D12_MESSAGE_ID_CANNOT_USE_COMMAND_RECORDER_WITHOUT_CURRENT_TARGET = 0x046d, + D3D12_MESSAGE_ID_CANNOT_CHANGE_COMMAND_RECORDER_TARGET_WHILE_RECORDING = 0x046e, + D3D12_MESSAGE_ID_COMMAND_POOL_SYNC = 0x046f, + D3D12_MESSAGE_ID_EVICT_UNDERFLOW = 0x0470, + D3D12_MESSAGE_ID_CREATE_META_COMMAND = 0x0471, + D3D12_MESSAGE_ID_LIVE_META_COMMAND = 0x0472, + D3D12_MESSAGE_ID_DESTROY_META_COMMAND = 0x0473, + D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALID_DST_RESOURCE = 0x0474, + D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALID_SRC_RESOURCE = 0x0475, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_DST_RESOURCE = 0x0476, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_SRC_RESOURCE = 0x0477, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_NULL_BUFFER = 0x0478, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_NULL_RESOURCE_DESC = 0x0479, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_UNSUPPORTED = 0x047a, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_BUFFER_DIMENSION = 0x047b, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_BUFFER_FLAGS = 0x047c, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_BUFFER_OFFSET = 0x047d, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_RESOURCE_DIMENSION = 0x047e, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_RESOURCE_FLAGS = 0x047f, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_OUTOFMEMORY_RETURN = 0x0480, + D3D12_MESSAGE_ID_CANNOT_CREATE_GRAPHICS_AND_VIDEO_COMMAND_RECORDER = 0x0481, + D3D12_MESSAGE_ID_UPDATETILEMAPPINGS_POSSIBLY_MISMATCHING_PROPERTIES = 0x0482, + D3D12_MESSAGE_ID_CREATE_COMMAND_LIST_INVALID_COMMAND_LIST_TYPE = 0x0483, + D3D12_MESSAGE_ID_CLEARUNORDEREDACCESSVIEW_INCOMPATIBLE_WITH_STRUCTURED_BUFFERS = 0x0484, + D3D12_MESSAGE_ID_COMPUTE_ONLY_DEVICE_OPERATION_UNSUPPORTED = 0x0485, + D3D12_MESSAGE_ID_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INVALID = 0x0486, + D3D12_MESSAGE_ID_EMIT_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_INVALID = 0x0487, + D3D12_MESSAGE_ID_COPY_RAYTRACING_ACCELERATION_STRUCTURE_INVALID = 0x0488, + D3D12_MESSAGE_ID_DISPATCH_RAYS_INVALID = 0x0489, + D3D12_MESSAGE_ID_GET_RAYTRACING_ACCELERATION_STRUCTURE_PREBUILD_INFO_INVALID = 0x048a, + D3D12_MESSAGE_ID_CREATE_LIFETIMETRACKER = 0x048b, + D3D12_MESSAGE_ID_LIVE_LIFETIMETRACKER = 0x048c, + D3D12_MESSAGE_ID_DESTROY_LIFETIMETRACKER = 0x048d, + D3D12_MESSAGE_ID_DESTROYOWNEDOBJECT_OBJECTNOTOWNED = 0x048e, + D3D12_MESSAGE_ID_CREATE_TRACKEDWORKLOAD = 0x048f, + D3D12_MESSAGE_ID_LIVE_TRACKEDWORKLOAD = 0x0490, + D3D12_MESSAGE_ID_DESTROY_TRACKEDWORKLOAD = 0x0491, + D3D12_MESSAGE_ID_RENDER_PASS_ERROR = 0x0492, + D3D12_MESSAGE_ID_META_COMMAND_ID_INVALID = 0x0493, + D3D12_MESSAGE_ID_META_COMMAND_UNSUPPORTED_PARAMS = 0x0494, + D3D12_MESSAGE_ID_META_COMMAND_FAILED_ENUMERATION = 0x0495, + D3D12_MESSAGE_ID_META_COMMAND_PARAMETER_SIZE_MISMATCH = 0x0496, + D3D12_MESSAGE_ID_UNINITIALIZED_META_COMMAND = 0x0497, + D3D12_MESSAGE_ID_META_COMMAND_INVALID_GPU_VIRTUAL_ADDRESS = 0x0498, + D3D12_MESSAGE_ID_CREATE_VIDEOENCODECOMMANDLIST = 0x0499, + D3D12_MESSAGE_ID_LIVE_VIDEOENCODECOMMANDLIST = 0x049a, + D3D12_MESSAGE_ID_DESTROY_VIDEOENCODECOMMANDLIST = 0x049b, + D3D12_MESSAGE_ID_CREATE_VIDEOENCODECOMMANDQUEUE = 0x049c, + D3D12_MESSAGE_ID_LIVE_VIDEOENCODECOMMANDQUEUE = 0x049d, + D3D12_MESSAGE_ID_DESTROY_VIDEOENCODECOMMANDQUEUE = 0x049e, + D3D12_MESSAGE_ID_CREATE_VIDEOMOTIONESTIMATOR = 0x049f, + D3D12_MESSAGE_ID_LIVE_VIDEOMOTIONESTIMATOR = 0x04a0, + D3D12_MESSAGE_ID_DESTROY_VIDEOMOTIONESTIMATOR = 0x04a1, + D3D12_MESSAGE_ID_CREATE_VIDEOMOTIONVECTORHEAP = 0x04a2, + D3D12_MESSAGE_ID_LIVE_VIDEOMOTIONVECTORHEAP = 0x04a3, + D3D12_MESSAGE_ID_DESTROY_VIDEOMOTIONVECTORHEAP = 0x04a4, + D3D12_MESSAGE_ID_MULTIPLE_TRACKED_WORKLOADS = 0x04a5, + D3D12_MESSAGE_ID_MULTIPLE_TRACKED_WORKLOAD_PAIRS = 0x04a6, + D3D12_MESSAGE_ID_OUT_OF_ORDER_TRACKED_WORKLOAD_PAIR = 0x04a7, + D3D12_MESSAGE_ID_CANNOT_ADD_TRACKED_WORKLOAD = 0x04a8, + D3D12_MESSAGE_ID_INCOMPLETE_TRACKED_WORKLOAD_PAIR = 0x04a9, + D3D12_MESSAGE_ID_CREATE_STATE_OBJECT_ERROR = 0x04aa, + D3D12_MESSAGE_ID_GET_SHADER_IDENTIFIER_ERROR = 0x04ab, + D3D12_MESSAGE_ID_GET_SHADER_STACK_SIZE_ERROR = 0x04ac, + D3D12_MESSAGE_ID_GET_PIPELINE_STACK_SIZE_ERROR = 0x04ad, + D3D12_MESSAGE_ID_SET_PIPELINE_STACK_SIZE_ERROR = 0x04ae, + D3D12_MESSAGE_ID_GET_SHADER_IDENTIFIER_SIZE_INVALID = 0x04af, + D3D12_MESSAGE_ID_CHECK_DRIVER_MATCHING_IDENTIFIER_INVALID = 0x04b0, + D3D12_MESSAGE_ID_CHECK_DRIVER_MATCHING_IDENTIFIER_DRIVER_REPORTED_ISSUE = 0x04b1, + D3D12_MESSAGE_ID_RENDER_PASS_INVALID_RESOURCE_BARRIER = 0x04b2, + D3D12_MESSAGE_ID_RENDER_PASS_DISALLOWED_API_CALLED = 0x04b3, + D3D12_MESSAGE_ID_RENDER_PASS_CANNOT_NEST_RENDER_PASSES = 0x04b4, + D3D12_MESSAGE_ID_RENDER_PASS_CANNOT_END_WITHOUT_BEGIN = 0x04b5, + D3D12_MESSAGE_ID_RENDER_PASS_CANNOT_CLOSE_COMMAND_LIST = 0x04b6, + D3D12_MESSAGE_ID_RENDER_PASS_GPU_WORK_WHILE_SUSPENDED = 0x04b7, + D3D12_MESSAGE_ID_RENDER_PASS_MISMATCHING_SUSPEND_RESUME = 0x04b8, + D3D12_MESSAGE_ID_RENDER_PASS_NO_PRIOR_SUSPEND_WITHIN_EXECUTECOMMANDLISTS = 0x04b9, + D3D12_MESSAGE_ID_RENDER_PASS_NO_SUBSEQUENT_RESUME_WITHIN_EXECUTECOMMANDLISTS = 0x04ba, + D3D12_MESSAGE_ID_TRACKED_WORKLOAD_COMMAND_QUEUE_MISMATCH = 0x04bb, + D3D12_MESSAGE_ID_TRACKED_WORKLOAD_NOT_SUPPORTED = 0x04bc, + D3D12_MESSAGE_ID_RENDER_PASS_MISMATCHING_NO_ACCESS = 0x04bd, + D3D12_MESSAGE_ID_RENDER_PASS_UNSUPPORTED_RESOLVE = 0x04be, + D3D12_MESSAGE_ID_CLEARUNORDEREDACCESSVIEW_INVALID_RESOURCE_PTR = 0x04bf, + D3D12_MESSAGE_ID_WINDOWS7_FENCE_OUTOFORDER_SIGNAL = 0x04c0, + D3D12_MESSAGE_ID_WINDOWS7_FENCE_OUTOFORDER_WAIT = 0x04c1, + D3D12_MESSAGE_ID_VIDEO_CREATE_MOTION_ESTIMATOR_INVALID_ARGUMENT = 0x04c2, + D3D12_MESSAGE_ID_VIDEO_CREATE_MOTION_VECTOR_HEAP_INVALID_ARGUMENT = 0x04c3, + D3D12_MESSAGE_ID_ESTIMATE_MOTION_INVALID_ARGUMENT = 0x04c4, + D3D12_MESSAGE_ID_RESOLVE_MOTION_VECTOR_HEAP_INVALID_ARGUMENT = 0x04c5, + D3D12_MESSAGE_ID_GETGPUVIRTUALADDRESS_INVALID_HEAP_TYPE = 0x04c6, + D3D12_MESSAGE_ID_SET_BACKGROUND_PROCESSING_MODE_INVALID_ARGUMENT = 0x04c7, + D3D12_MESSAGE_ID_CREATE_COMMAND_LIST_INVALID_COMMAND_LIST_TYPE_FOR_FEATURE_LEVEL = 0x04c8, + D3D12_MESSAGE_ID_CREATE_VIDEOEXTENSIONCOMMAND = 0x04c9, + D3D12_MESSAGE_ID_LIVE_VIDEOEXTENSIONCOMMAND = 0x04ca, + D3D12_MESSAGE_ID_DESTROY_VIDEOEXTENSIONCOMMAND = 0x04cb, + D3D12_MESSAGE_ID_INVALID_VIDEO_EXTENSION_COMMAND_ID = 0x04cc, + D3D12_MESSAGE_ID_VIDEO_EXTENSION_COMMAND_INVALID_ARGUMENT = 0x04cd, + D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_NOT_UNIQUE_IN_DXIL_LIBRARY = 0x04ce, + D3D12_MESSAGE_ID_VARIABLE_SHADING_RATE_NOT_ALLOWED_WITH_TIR = 0x04cf, + D3D12_MESSAGE_ID_GEOMETRY_SHADER_OUTPUTTING_BOTH_VIEWPORT_ARRAY_INDEX_AND_SHADING_RATE_NOT_SUPPORTED_ON_DEVICE = 0x04d0, + D3D12_MESSAGE_ID_RSSETSHADING_RATE_INVALID_SHADING_RATE = 0x04d1, + D3D12_MESSAGE_ID_RSSETSHADING_RATE_SHADING_RATE_NOT_PERMITTED_BY_CAP = 0x04d2, + D3D12_MESSAGE_ID_RSSETSHADING_RATE_INVALID_COMBINER = 0x04d3, + D3D12_MESSAGE_ID_RSSETSHADINGRATEIMAGE_REQUIRES_TIER_2 = 0x04d4, + D3D12_MESSAGE_ID_RSSETSHADINGRATE_REQUIRES_TIER_1 = 0x04d5, + D3D12_MESSAGE_ID_SHADING_RATE_IMAGE_INCORRECT_FORMAT = 0x04d6, + D3D12_MESSAGE_ID_SHADING_RATE_IMAGE_INCORRECT_ARRAY_SIZE = 0x04d7, + D3D12_MESSAGE_ID_SHADING_RATE_IMAGE_INCORRECT_MIP_LEVEL = 0x04d8, + D3D12_MESSAGE_ID_SHADING_RATE_IMAGE_INCORRECT_SAMPLE_COUNT = 0x04d9, + D3D12_MESSAGE_ID_SHADING_RATE_IMAGE_INCORRECT_SAMPLE_QUALITY = 0x04da, + D3D12_MESSAGE_ID_NON_RETAIL_SHADER_MODEL_WONT_VALIDATE = 0x04db, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_AS_ROOT_SIGNATURE_MISMATCH = 0x04dc, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_MS_ROOT_SIGNATURE_MISMATCH = 0x04dd, + D3D12_MESSAGE_ID_ADD_TO_STATE_OBJECT_ERROR = 0x04de, + D3D12_MESSAGE_ID_CREATE_PROTECTED_RESOURCE_SESSION_INVALID_ARGUMENT = 0x04df, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_MS_PSO_DESC_MISMATCH = 0x04e0, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_MS_INCOMPLETE_TYPE = 0x04e1, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_AS_NOT_MS_MISMATCH = 0x04e2, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_MS_NOT_PS_MISMATCH = 0x04e3, + D3D12_MESSAGE_ID_NONZERO_SAMPLER_FEEDBACK_MIP_REGION_WITH_INCOMPATIBLE_FORMAT = 0x04e4, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INPUTLAYOUT_SHADER_MISMATCH = 0x04e5, + D3D12_MESSAGE_ID_EMPTY_DISPATCH = 0x04e6, + D3D12_MESSAGE_ID_RESOURCE_FORMAT_REQUIRES_SAMPLER_FEEDBACK_CAPABILITY = 0x04e7, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_MAP_INVALID_MIP_REGION = 0x04e8, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_MAP_INVALID_DIMENSION = 0x04e9, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_MAP_INVALID_SAMPLE_COUNT = 0x04ea, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_MAP_INVALID_SAMPLE_QUALITY = 0x04eb, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_MAP_INVALID_LAYOUT = 0x04ec, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_MAP_REQUIRES_UNORDERED_ACCESS_FLAG = 0x04ed, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_CREATE_UAV_NULL_ARGUMENTS = 0x04ee, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_UAV_REQUIRES_SAMPLER_FEEDBACK_CAPABILITY = 0x04ef, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_CREATE_UAV_REQUIRES_FEEDBACK_MAP_FORMAT = 0x04f0, + D3D12_MESSAGE_ID_CREATEMESHSHADER_INVALIDSHADERBYTECODE = 0x04f1, + D3D12_MESSAGE_ID_CREATEMESHSHADER_OUTOFMEMORY = 0x04f2, + D3D12_MESSAGE_ID_CREATEMESHSHADERWITHSTREAMOUTPUT_INVALIDSHADERTYPE = 0x04f3, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_SAMPLER_FEEDBACK_TRANSCODE_INVALID_FORMAT = 0x04f4, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_SAMPLER_FEEDBACK_INVALID_MIP_LEVEL_COUNT = 0x04f5, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_SAMPLER_FEEDBACK_TRANSCODE_ARRAY_SIZE_MISMATCH = 0x04f6, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_CREATE_UAV_MISMATCHING_TARGETED_RESOURCE = 0x04f7, + D3D12_MESSAGE_ID_CREATEMESHSHADER_OUTPUTEXCEEDSMAXSIZE = 0x04f8, + D3D12_MESSAGE_ID_CREATEMESHSHADER_GROUPSHAREDEXCEEDSMAXSIZE = 0x04f9, + D3D12_MESSAGE_ID_VERTEX_SHADER_OUTPUTTING_BOTH_VIEWPORT_ARRAY_INDEX_AND_SHADING_RATE_NOT_SUPPORTED_ON_DEVICE = 0x04fa, + D3D12_MESSAGE_ID_MESH_SHADER_OUTPUTTING_BOTH_VIEWPORT_ARRAY_INDEX_AND_SHADING_RATE_NOT_SUPPORTED_ON_DEVICE = 0x04fb, + D3D12_MESSAGE_ID_CREATEMESHSHADER_MISMATCHEDASMSPAYLOADSIZE = 0x04fc, + D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_UNBOUNDED_STATIC_DESCRIPTORS = 0x04fd, + D3D12_MESSAGE_ID_CREATEAMPLIFICATIONSHADER_INVALIDSHADERBYTECODE = 0x04fe, + D3D12_MESSAGE_ID_CREATEAMPLIFICATIONSHADER_OUTOFMEMORY = 0x04ff, + D3D12_MESSAGE_ID_D3D12_MESSAGES_END +} D3D12_MESSAGE_ID; + +typedef enum D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE +{ + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_NONE = 0x0, + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_STATE_TRACKING_ONLY = 0x1, + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_UNGUARDED_VALIDATION = 0x2, + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_GUARDED_VALIDATION = 0x3, + NUM_D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODES = 0x4, +} D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE; + +typedef struct D3D12_MESSAGE +{ + D3D12_MESSAGE_CATEGORY Category; + D3D12_MESSAGE_SEVERITY Severity; + D3D12_MESSAGE_ID ID; + const char *pDescription; + SIZE_T DescriptionByteLength; +} D3D12_MESSAGE; + +typedef struct D3D12_INFO_QUEUE_FILTER_DESC +{ + UINT NumCategories; + D3D12_MESSAGE_CATEGORY *pCategoryList; + UINT NumSeverities; + D3D12_MESSAGE_SEVERITY *pSeverityList; + UINT NumIDs; + D3D12_MESSAGE_ID *pIDList; +} D3D12_INFO_QUEUE_FILTER_DESC; + +typedef struct D3D12_INFO_QUEUE_FILTER +{ + D3D12_INFO_QUEUE_FILTER_DESC AllowList; + D3D12_INFO_QUEUE_FILTER_DESC DenyList; +} D3D12_INFO_QUEUE_FILTER; + [ uuid(344488b7-6846-474b-b989-f027448245e0), object, @@ -41,3 +951,49 @@ interface ID3D12Debug1 : IUnknown void SetEnableGPUBasedValidation(BOOL enable); void SetEnableSynchronizedCommandQueueValidation(BOOL enable); } + +[ + uuid(0742a90b-c387-483f-b946-30a7e4e61458), + object, + local, + pointer_default(unique) +] +interface ID3D12InfoQueue : IUnknown +{ + HRESULT SetMessageCountLimit([in] UINT64 limit); + void ClearStoredMessages(); + HRESULT GetMessage([in] UINT64 index, [out] D3D12_MESSAGE *message, [in, out] SIZE_T *length); + UINT64 GetNumMessagesAllowedByStorageFilter(); + UINT64 GetNumMessagesDeniedByStorageFilter(); + UINT64 GetNumStoredMessages(); + UINT64 GetNumStoredMessagesAllowedByRetrievalFilter(); + UINT64 GetNumMessagesDiscardedByMessageCountLimit(); + UINT64 GetMessageCountLimit(); + HRESULT AddStorageFilterEntries([in] D3D12_INFO_QUEUE_FILTER *filter); + HRESULT GetStorageFilter([out] D3D12_INFO_QUEUE_FILTER *filter, [in, out] SIZE_T *length); + void ClearStorageFilter(); + HRESULT PushEmptyStorageFilter(); + HRESULT PushCopyOfStorageFilter(); + HRESULT PushStorageFilter([in] D3D12_INFO_QUEUE_FILTER *filter); + void PopStorageFilter(); + UINT GetStorageFilterStackSize(); + HRESULT AddRetrievalFilterEntries([in] D3D12_INFO_QUEUE_FILTER *filter); + HRESULT GetRetrievalFilter([out] D3D12_INFO_QUEUE_FILTER *filter, [in, out] SIZE_T *length); + void ClearRetrievalFilter(); + HRESULT PushEmptyRetrievalFilter(); + HRESULT PushCopyOfRetrievalFilter(); + HRESULT PushRetrievalFilter([in] D3D12_INFO_QUEUE_FILTER *filter); + void PopRetrievalFilter(); + UINT GetRetrievalFilterStackSize(); + HRESULT AddMessage([in] D3D12_MESSAGE_CATEGORY category, [in] D3D12_MESSAGE_SEVERITY severity, + [in] D3D12_MESSAGE_ID id, [in] const char *description); + HRESULT AddApplicationMessage([in] D3D12_MESSAGE_SEVERITY severity, [in] const char *description); + HRESULT SetBreakOnCategory([in] D3D12_MESSAGE_CATEGORY category, [in] BOOL enable); + HRESULT SetBreakOnSeverity([in] D3D12_MESSAGE_SEVERITY severity, [in] BOOL enable); + HRESULT SetBreakOnID([in] D3D12_MESSAGE_ID id, [in] BOOL enable); + BOOL GetBreakOnCategory([in] D3D12_MESSAGE_CATEGORY category); + BOOL GetBreakOnSeverity([in] D3D12_MESSAGE_SEVERITY severity); + BOOL GetBreakOnID([in] D3D12_MESSAGE_ID id); + void SetMuteDebugOutput([in] BOOL mute); + BOOL GetMuteDebugOutput(); +} -- 2.20.1

1 0

[PATCH v3 2/2] dxgi: Update swapchain containing output after Alt+Enter was used to exit fullscreen.
by Zhiyi Zhang 09 Oct '20

09 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 194122. Put a struct wined3d_swapchain_state_parent in d3d/dxgi swapchains. struct wined3d_swapchain_state_parent is passed to wined3d_swapchain_create as a parameter and not in struct wined3d_swapchain_desc because puttting it in there will make some swapchain description struct conversion ugly. For example, wined3d_swapchain_desc_from_dxgi() needs to take in account of whether it's a d3d11 or d3d12 swapchain and then set corresponding wined3d_swapchain_state_parent unless we set the field outside of wined3d_swapchain_desc_from_dxgi(), which doesn't seem nice also. v3: Supersede 194317. Fix a test failures. dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/swapchain.c | 16 ++++++++-- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/swapchain.c | 16 ++++++++-- dlls/ddraw/ddraw.c | 16 ++++++++-- dlls/ddraw/ddraw_private.h | 1 + dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 57 ++++++++++++++++++++++++++++++++-- dlls/dxgi/tests/dxgi.c | 13 ++++---- dlls/wined3d/adapter_gl.c | 9 +++--- dlls/wined3d/adapter_vk.c | 10 +++--- dlls/wined3d/directx.c | 10 +++--- dlls/wined3d/swapchain.c | 52 ++++++++++++++++++++----------- dlls/wined3d/wined3d.spec | 4 +-- dlls/wined3d/wined3d_private.h | 16 +++++++--- include/wine/wined3d.h | 20 ++++++++++-- 16 files changed, 187 insertions(+), 56 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index e98746a13bd..bb25be16de0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -185,6 +185,7 @@ struct d3d8_swapchain IDirect3DSwapChain8 IDirect3DSwapChain8_iface; LONG refcount; struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_state_parent state_parent; IDirect3DDevice8 *parent_device; unsigned int swap_interval; }; diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index f08a19ca238..78db4fcaf24 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -156,6 +156,17 @@ static const struct wined3d_parent_ops d3d8_swapchain_wined3d_parent_ops = d3d8_swapchain_wined3d_object_released, }; +static void CDECL d3d8_swapchain_windowed_state_changed(struct wined3d_swapchain_state_parent *parent, + BOOL windowed) +{ + TRACE("parent %p, windowed %d.\n", parent, windowed); +} + +static const struct wined3d_swapchain_state_parent_ops d3d8_swapchain_state_parent_ops = +{ + d3d8_swapchain_windowed_state_changed, +}; + static HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_device *device, struct wined3d_swapchain_desc *desc, unsigned int swap_interval) { @@ -163,10 +174,11 @@ static HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_devi swapchain->refcount = 1; swapchain->IDirect3DSwapChain8_iface.lpVtbl = &d3d8_swapchain_vtbl; + swapchain->state_parent.ops = &d3d8_swapchain_state_parent_ops; swapchain->swap_interval = swap_interval; - if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, - &d3d8_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, &swapchain->state_parent, + swapchain, &d3d8_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index e78ce75a2f0..03ab10ad01b 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -162,6 +162,7 @@ struct d3d9_swapchain IDirect3DSwapChain9Ex IDirect3DSwapChain9Ex_iface; LONG refcount; struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_state_parent state_parent; IDirect3DDevice9Ex *parent_device; unsigned int swap_interval; }; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 8d6cff982d3..0955b672c79 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -356,6 +356,17 @@ static const struct wined3d_parent_ops d3d9_swapchain_wined3d_parent_ops = d3d9_swapchain_wined3d_object_released, }; +static void CDECL d3d9_swapchain_windowed_state_changed(struct wined3d_swapchain_state_parent *parent, + BOOL windowed) +{ + TRACE("parent %p, windowed %d.\n", parent, windowed); +} + +static const struct wined3d_swapchain_state_parent_ops d3d9_swapchain_state_parent_ops = +{ + d3d9_swapchain_windowed_state_changed, +}; + static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_device *device, struct wined3d_swapchain_desc *desc, unsigned int swap_interval) { @@ -363,10 +374,11 @@ static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_devi swapchain->refcount = 1; swapchain->IDirect3DSwapChain9Ex_iface.lpVtbl = &d3d9_swapchain_vtbl; + swapchain->state_parent.ops = &d3d9_swapchain_state_parent_ops; swapchain->swap_interval = swap_interval; - if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, - &d3d9_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, &swapchain->state_parent, + swapchain, &d3d9_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c3c335d978e..11a16f8d535 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -80,6 +80,17 @@ const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops = ddraw_null_wined3d_object_destroyed, }; +static void CDECL ddraw_swapchain_windowed_state_changed(struct wined3d_swapchain_state_parent *parent, + BOOL windowed) +{ + TRACE("parent %p, windowed %d.\n", parent, windowed); +} + +static const struct wined3d_swapchain_state_parent_ops ddraw_swapchain_state_parent_ops = +{ + ddraw_swapchain_windowed_state_changed, +}; + static inline struct ddraw *impl_from_IDirectDraw(IDirectDraw *iface) { return CONTAINING_RECORD(iface, struct ddraw, IDirectDraw_iface); @@ -577,7 +588,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, if (ddraw->flags & DDRAW_NO3D) return wined3d_swapchain_create(ddraw->wined3d_device, &swapchain_desc, - NULL, &ddraw_null_wined3d_parent_ops, wined3d_swapchain); + &ddraw->state_parent, NULL, &ddraw_null_wined3d_parent_ops, wined3d_swapchain); if (!window || window == GetDesktopWindow()) { @@ -605,7 +616,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, * recursive loop until ram or emulated video memory is full. */ ddraw->flags |= DDRAW_D3D_INITIALIZED; if (FAILED(hr = wined3d_swapchain_create(ddraw->wined3d_device, &swapchain_desc, - NULL, &ddraw_null_wined3d_parent_ops, wined3d_swapchain))) + &ddraw->state_parent, NULL, &ddraw_null_wined3d_parent_ops, wined3d_swapchain))) { ddraw->flags &= ~DDRAW_D3D_INITIALIZED; DestroyWindow(window); @@ -5105,6 +5116,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de ddraw->IDirect3D3_iface.lpVtbl = &d3d3_vtbl; ddraw->IDirect3D7_iface.lpVtbl = &d3d7_vtbl; ddraw->device_parent.ops = &ddraw_wined3d_device_parent_ops; + ddraw->state_parent.ops = &ddraw_swapchain_state_parent_ops; ddraw->numIfaces = 1; ddraw->ref7 = 1; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 776f61e1024..6bbd62949ac 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -105,6 +105,7 @@ struct ddraw struct wined3d_texture *wined3d_frontbuffer; struct wined3d_texture *gdi_surface; struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_state_parent state_parent; HWND swapchain_window; /* DirectDraw things, which are not handled by WineD3D */ diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index e43ee59461c..acba3544e39 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -177,6 +177,7 @@ struct d3d11_swapchain LONG refcount; struct wined3d_private_store private_store; struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_state_parent state_parent; IWineDXGIDevice *device; IDXGIFactory *factory; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 36beb84aa28..0f335a71cb7 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -811,6 +811,30 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = d3d11_swapchain_wined3d_object_released, }; +static inline struct d3d11_swapchain *d3d11_swapchain_from_wined3d_swapchain_state_parent(struct wined3d_swapchain_state_parent *parent) +{ + return CONTAINING_RECORD(parent, struct d3d11_swapchain, state_parent); +} + +static void CDECL d3d11_swapchain_windowed_state_changed(struct wined3d_swapchain_state_parent *parent, + BOOL windowed) +{ + struct d3d11_swapchain *swapchain = d3d11_swapchain_from_wined3d_swapchain_state_parent(parent); + + TRACE("parent %p, windowed %d.\n", parent, windowed); + + if (windowed && swapchain->target) + { + IDXGIOutput_Release(swapchain->target); + swapchain->target = NULL; + } +} + +static const struct wined3d_swapchain_state_parent_ops d3d11_swapchain_state_parent_ops = +{ + d3d11_swapchain_windowed_state_changed, +}; + HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc) { @@ -840,6 +864,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi } swapchain->IDXGISwapChain1_iface.lpVtbl = &d3d11_swapchain_vtbl; + swapchain->state_parent.ops = &d3d11_swapchain_state_parent_ops; swapchain->refcount = 1; wined3d_mutex_lock(); wined3d_private_store_init(&swapchain->private_store); @@ -849,8 +874,8 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi fullscreen = !desc->windowed; desc->windowed = TRUE; - if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, - &d3d11_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, &swapchain->state_parent, + swapchain, &d3d11_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); goto cleanup; @@ -1037,6 +1062,7 @@ struct d3d12_swapchain struct wined3d_private_store private_store; struct wined3d_swapchain_state *state; + struct wined3d_swapchain_state_parent state_parent; VkSwapchainKHR vk_swapchain; VkSurfaceKHR vk_surface; @@ -2938,6 +2964,30 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return TRUE; } +static inline struct d3d12_swapchain *d3d12_swapchain_from_wined3d_swapchain_state_parent(struct wined3d_swapchain_state_parent *parent) +{ + return CONTAINING_RECORD(parent, struct d3d12_swapchain, state_parent); +} + +static void CDECL d3d12_swapchain_windowed_state_changed(struct wined3d_swapchain_state_parent *parent, + BOOL windowed) +{ + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_wined3d_swapchain_state_parent(parent); + + TRACE("parent %p, windowed %d.\n", parent, windowed); + + if (windowed && swapchain->target) + { + IDXGIOutput_Release(swapchain->target); + swapchain->target = NULL; + } +} + +static const struct wined3d_swapchain_state_parent_ops d3d12_swapchain_state_parent_ops = +{ + d3d12_swapchain_windowed_state_changed, +}; + static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGIFactory *factory, ID3D12Device *device, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc) @@ -2967,6 +3017,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI } swapchain->IDXGISwapChain4_iface.lpVtbl = &d3d12_swapchain_vtbl; + swapchain->state_parent.ops = &d3d12_swapchain_state_parent_ops; swapchain->refcount = 1; swapchain->window = window; @@ -3024,7 +3075,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI dxgi_factory = unsafe_impl_from_IDXGIFactory((IDXGIFactory *)factory); if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, dxgi_factory->wined3d, - &swapchain->state))) + &swapchain->state_parent, &swapchain->state))) { IDXGIOutput_Release(output); return hr; diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 2838a025e57..bf798508a6d 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2431,7 +2431,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) flush_events(); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(!fullscreen, "Expect swapchain not full screen.\n"); + ok(!fullscreen, "Expect swapchain not full screen.\n"); /* Move the swapchain output window to the second output */ hr = IDXGIOutput_GetDesc(output2, &output_desc2); @@ -2453,7 +2453,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); IDXGIOutput_Release(output); @@ -2465,7 +2465,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); @@ -6148,7 +6148,6 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) UINT flag; BOOL expect_fullscreen; BOOL broken_d3d10; - BOOL todo_on_d3d12; } tests[] = { @@ -6162,15 +6161,15 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) * - Posting them hangs the posting thread. Another thread that keeps * sending input is needed to avoid the hang. The hang is not * because of flush_events(). */ - {0, TRUE, FALSE, TRUE}, + {0, TRUE}, {0, FALSE}, {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, {DXGI_MWA_NO_ALT_ENTER, FALSE, TRUE}, {DXGI_MWA_NO_ALT_ENTER, FALSE}, - {DXGI_MWA_NO_PRINT_SCREEN, TRUE, FALSE, TRUE}, + {DXGI_MWA_NO_PRINT_SCREEN, TRUE}, {DXGI_MWA_NO_PRINT_SCREEN, FALSE}, - {0, TRUE, FALSE, TRUE}, + {0, TRUE}, {0, FALSE} }; diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 5bf9d179e4d..140948beb6d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4590,19 +4590,20 @@ static void adapter_gl_copy_bo_address(struct wined3d_context *context, wined3d_context_gl_copy_bo_address(wined3d_context_gl(context), dst, src, size); } -static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, +static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { struct wined3d_swapchain_gl *swapchain_gl; HRESULT hr; - TRACE("device %p, desc %p, parent %p, parent_ops %p, swapchain %p.\n", - device, desc, parent, parent_ops, swapchain); + TRACE("device %p, desc %p, state_parent %p, parent %p, parent_ops %p, swapchain %p.\n", + device, desc, state_parent, parent, parent_ops, swapchain); if (!(swapchain_gl = heap_alloc_zero(sizeof(*swapchain_gl)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_swapchain_gl_init(swapchain_gl, device, desc, parent, parent_ops))) + if (FAILED(hr = wined3d_swapchain_gl_init(swapchain_gl, device, desc, state_parent, parent, parent_ops))) { WARN("Failed to initialise swapchain, hr %#x.\n", hr); heap_free(swapchain_gl); diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5c219d45d3e..64850944040 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1103,19 +1103,21 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, adapter_vk_unmap_bo_address(context, src, 0, NULL); } -static HRESULT adapter_vk_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, +static HRESULT adapter_vk_create_swapchain(struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { struct wined3d_swapchain_vk *swapchain_vk; HRESULT hr; - TRACE("device %p, desc %p, parent %p, parent_ops %p, swapchain %p.\n", - device, desc, parent, parent_ops, swapchain); + TRACE("device %p, desc %p, state_parent %p, parent %p, parent_ops %p, swapchain %p.\n", + device, desc, state_parent, parent, parent_ops, swapchain); if (!(swapchain_vk = heap_alloc_zero(sizeof(*swapchain_vk)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_swapchain_vk_init(swapchain_vk, device, desc, parent, parent_ops))) + if (FAILED(hr = wined3d_swapchain_vk_init(swapchain_vk, device, desc, state_parent, parent, + parent_ops))) { WARN("Failed to initialise swapchain, hr %#x.\n", hr); heap_free(swapchain_vk); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0fa05a06be6..108a190bf61 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2665,19 +2665,21 @@ static void adapter_no3d_copy_bo_address(struct wined3d_context *context, memcpy(dst->addr, src->addr, size); } -static HRESULT adapter_no3d_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, +static HRESULT adapter_no3d_create_swapchain(struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { struct wined3d_swapchain *swapchain_no3d; HRESULT hr; - TRACE("device %p, desc %p, parent %p, parent_ops %p, swapchain %p.\n", - device, desc, parent, parent_ops, swapchain); + TRACE("device %p, desc %p, state_parent %p, parent %p, parent_ops %p, swapchain %p.\n", + device, desc, state_parent, parent, parent_ops, swapchain); if (!(swapchain_no3d = heap_alloc_zero(sizeof(*swapchain_no3d)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_swapchain_no3d_init(swapchain_no3d, device, desc, parent, parent_ops))) + if (FAILED(hr = wined3d_swapchain_no3d_init(swapchain_no3d, device, desc, state_parent, parent, + parent_ops))) { WARN("Failed to initialise swapchain, hr %#x.\n", hr); heap_free(swapchain_no3d); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b35fb5af65a..f8214379971 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1288,7 +1288,8 @@ static enum wined3d_format_id adapter_format_from_backbuffer_format(const struct } static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *state, - const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d *wined3d) + const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d *wined3d, + struct wined3d_swapchain_state_parent *parent) { HRESULT hr; @@ -1319,6 +1320,7 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat GetWindowRect(window, &state->original_window_rect); state->device_window = window; + state->parent = parent; if (desc->flags & WINED3D_SWAPCHAIN_REGISTER_STATE) wined3d_swapchain_state_register(state, wined3d); @@ -1327,7 +1329,8 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat } static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, - struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, + void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_swapchain_ops *swapchain_ops) { struct wined3d_resource_desc texture_desc; @@ -1353,7 +1356,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); window = desc->device_window ? desc->device_window : device->create_parms.focus_window; - if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d))) + if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d, state_parent))) { ERR("Failed to initialise swapchain state, hr %#x.\n", hr); goto err; @@ -1568,23 +1571,27 @@ err: } HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, struct wined3d_device *device, - struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, + void *parent, const struct wined3d_parent_ops *parent_ops) { - TRACE("swapchain_no3d %p, device %p, desc %p, parent %p, parent_ops %p.\n", - swapchain_no3d, device, desc, parent, parent_ops); + TRACE("swapchain_no3d %p, device %p, desc %p, state_parent %p, parent %p, parent_ops %p.\n", + swapchain_no3d, device, desc, state_parent, parent, parent_ops); - return wined3d_swapchain_init(swapchain_no3d, device, desc, parent, parent_ops, &swapchain_no3d_ops); + return wined3d_swapchain_init(swapchain_no3d, device, desc, state_parent, parent, parent_ops, + &swapchain_no3d_ops); } HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, - struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, + void *parent, const struct wined3d_parent_ops *parent_ops) { HRESULT hr; - TRACE("swapchain_gl %p, device %p, desc %p, parent %p, parent_ops %p.\n", - swapchain_gl, device, desc, parent, parent_ops); + TRACE("swapchain_gl %p, device %p, desc %p, state_parent %p, parent %p, parent_ops %p.\n", + swapchain_gl, device, desc, state_parent, parent, parent_ops); - if (FAILED(hr = wined3d_swapchain_init(&swapchain_gl->s, device, desc, parent, parent_ops, &swapchain_gl_ops))) + if (FAILED(hr = wined3d_swapchain_init(&swapchain_gl->s, device, desc, state_parent, parent, + parent_ops, &swapchain_gl_ops))) { /* Cleanup any context that may have been created for the swapchain. */ wined3d_cs_destroy_object(device->cs, wined3d_swapchain_gl_destroy_object, swapchain_gl); @@ -1595,14 +1602,16 @@ HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, str } HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain_vk *swapchain_vk, struct wined3d_device *device, - struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, + void *parent, const struct wined3d_parent_ops *parent_ops) { HRESULT hr; TRACE("swapchain_vk %p, device %p, desc %p, parent %p, parent_ops %p.\n", swapchain_vk, device, desc, parent, parent_ops); - if (FAILED(hr = wined3d_swapchain_init(&swapchain_vk->s, device, desc, parent, parent_ops, &swapchain_vk_ops))) + if (FAILED(hr = wined3d_swapchain_init(&swapchain_vk->s, device, desc, state_parent, parent, + parent_ops, &swapchain_vk_ops))) return hr; if (swapchain_vk->s.win_handle == GetDesktopWindow()) @@ -1620,14 +1629,16 @@ HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain_vk *swapchain_vk, str return hr; } -HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) +HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, + void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_swapchain **swapchain) { struct wined3d_swapchain *object; HRESULT hr; if (FAILED(hr = device->adapter->adapter_ops->adapter_create_swapchain(device, - desc, parent, parent_ops, &object))) + desc, state_parent, parent, parent_ops, &object))) return hr; if (desc->flags & WINED3D_SWAPCHAIN_IMPLICIT) @@ -2175,6 +2186,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st { struct wined3d_display_mode actual_mode; struct wined3d_output_desc output_desc; + BOOL windowed = state->desc.windowed; HRESULT hr; TRACE("state %p, swapchain_desc %p, mode %p.\n", state, swapchain_desc, mode); @@ -2263,6 +2275,9 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st state->desc.output = swapchain_desc->output; state->desc.windowed = swapchain_desc->windowed; + if (windowed != state->desc.windowed) + state->parent->ops->windowed_state_changed(state->parent, state->desc.windowed); + return WINED3D_OK; } @@ -2280,7 +2295,8 @@ void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state } HRESULT CDECL wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, - HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state **state) + HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state_parent *state_parent, + struct wined3d_swapchain_state **state) { struct wined3d_swapchain_state *s; HRESULT hr; @@ -2290,7 +2306,7 @@ HRESULT CDECL wined3d_swapchain_state_create(const struct wined3d_swapchain_desc if (!(s = heap_alloc_zero(sizeof(*s)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window, wined3d))) + if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window, wined3d, state_parent))) { heap_free(s); return hr; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 77b22b3c907..e4ff1161bce 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -271,7 +271,7 @@ @ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_i(ptr long long ptr) -@ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) +@ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) @ cdecl wined3d_swapchain_get_back_buffer(ptr long) @ cdecl wined3d_swapchain_get_device(ptr) @@ -289,7 +289,7 @@ @ cdecl wined3d_swapchain_set_palette(ptr ptr) @ cdecl wined3d_swapchain_set_window(ptr ptr) -@ cdecl wined3d_swapchain_state_create(ptr ptr ptr ptr) +@ cdecl wined3d_swapchain_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_is_windowed(ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bbb0a60d7bb..4c2204cd86e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3245,8 +3245,10 @@ struct wined3d_adapter_ops unsigned int range_count, const struct wined3d_range *ranges); void (*adapter_copy_bo_address)(struct wined3d_context *context, const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size); - HRESULT (*adapter_create_swapchain)(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); + HRESULT (*adapter_create_swapchain)(struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, + struct wined3d_swapchain_state_parent *state_parent, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); void (*adapter_destroy_swapchain)(struct wined3d_swapchain *swapchain); HRESULT (*adapter_create_buffer)(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, @@ -5070,6 +5072,7 @@ void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_vie struct wined3d_swapchain_state { struct wined3d_swapchain_desc desc; + struct wined3d_swapchain_state_parent *parent; struct wined3d_display_mode original_mode, d3d_mode; RECT original_window_rect; @@ -5128,7 +5131,8 @@ void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + struct wined3d_swapchain_state_parent *state_parent, void *parent, + const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; struct wined3d_swapchain_gl { @@ -5153,7 +5157,8 @@ HDC wined3d_swapchain_gl_get_backup_dc(struct wined3d_swapchain_gl *swapchain_gl struct wined3d_context_gl *wined3d_swapchain_gl_get_context(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + struct wined3d_swapchain_state_parent *state_parent, void *parent, + const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; struct wined3d_swapchain_vk { @@ -5179,7 +5184,8 @@ static inline struct wined3d_swapchain_vk *wined3d_swapchain_vk(struct wined3d_s void wined3d_swapchain_vk_cleanup(struct wined3d_swapchain_vk *swapchain_vk) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain_vk *swapchain_vk, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + struct wined3d_swapchain_state_parent *state_parent, void *parent, + const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; /***************************************************************************** * Utility function prototypes diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 61ab0e90953..62ea3960118 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2248,6 +2248,17 @@ struct wined3d_device_parent_ops const struct wined3d_resource_desc *desc, DWORD texture_flags, struct wined3d_texture **texture); }; +struct wined3d_swapchain_state_parent +{ + const struct wined3d_swapchain_state_parent_ops *ops; +}; + +struct wined3d_swapchain_state_parent_ops +{ + void (__cdecl *windowed_state_changed)(struct wined3d_swapchain_state_parent *state_parent, + BOOL windowed); +}; + struct wined3d_private_store { struct list content; @@ -2774,8 +2785,10 @@ HRESULT __cdecl wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *st HRESULT __cdecl wined3d_stateblock_set_vs_consts_i(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); -HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); +HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, + void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_swapchain **swapchain); ULONG __cdecl wined3d_swapchain_decref(struct wined3d_swapchain *swapchain); struct wined3d_texture * __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, UINT backbuffer_idx); @@ -2804,7 +2817,8 @@ void __cdecl wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, - HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state **state); + HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state_parent *state_parent, + struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); BOOL __cdecl wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, -- 2.25.1

2 1

[PATCH v3 1/2] dxgi: Support Alt+Enter for d3d12 swapchains.
by Zhiyi Zhang 09 Oct '20

09 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 194121 and 194123. Make wined3d_swapchain_state_register/unregister private in wined3d. v3: Supersede 194316. dlls/dxgi/swapchain.c | 32 +++++++++-- dlls/dxgi/tests/dxgi.c | 1 - dlls/dxgi/utils.c | 2 +- dlls/wined3d/swapchain.c | 19 +++---- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 99 +++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 5 +- include/wine/wined3d.h | 4 +- 8 files changed, 95 insertions(+), 69 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f3b74389d29..36beb84aa28 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2272,18 +2272,37 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapCha BOOL *fullscreen, IDXGIOutput **target) { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); + BOOL windowed; + HRESULT hr; TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); - if (fullscreen) + if (fullscreen || target) { wined3d_mutex_lock(); - *fullscreen = !wined3d_swapchain_state_is_windowed(swapchain->state); + windowed = wined3d_swapchain_state_is_windowed(swapchain->state); wined3d_mutex_unlock(); } - if (target && (*target = swapchain->target)) - IDXGIOutput_AddRef(*target); + if (fullscreen) + *fullscreen = !windowed; + + if (target) + { + if (!windowed) + { + if (!swapchain->target && FAILED(hr = IDXGISwapChain4_GetContainingOutput(iface, + &swapchain->target))) + return hr; + + *target = swapchain->target; + IDXGIOutput_AddRef(*target); + } + else + { + *target = NULL; + } + } return S_OK; } @@ -2927,6 +2946,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI struct wined3d_swapchain_desc wined3d_desc; VkWin32SurfaceCreateInfoKHR surface_desc; VkPhysicalDevice vk_physical_device; + struct dxgi_factory *dxgi_factory; VkFenceCreateInfo fence_desc; uint32_t queue_family_index; VkSurfaceKHR vk_surface; @@ -3002,7 +3022,9 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hr; } - if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, &swapchain->state))) + dxgi_factory = unsafe_impl_from_IDXGIFactory((IDXGIFactory *)factory); + if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, dxgi_factory->wined3d, + &swapchain->state))) { IDXGIOutput_Release(output); return hr; diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f747e236f31..2838a025e57 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6272,7 +6272,6 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) output = NULL; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(is_d3d12 && tests[i].todo_on_d3d12) ok(fullscreen == tests[i].expect_fullscreen || broken(tests[i].broken_d3d10 && fullscreen), "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 665413e4c62..af72f83b6b0 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -520,7 +520,7 @@ unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE dxgi_usage) #define DXGI_WINED3D_SWAPCHAIN_FLAGS \ (WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE | WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT \ - | WINED3D_SWAPCHAIN_HOOK | WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE) + | WINED3D_SWAPCHAIN_REGISTER_STATE | WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE) unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d0d93417a18..b35fb5af65a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -34,7 +34,7 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) TRACE("Destroying swapchain %p.\n", swapchain); - wined3d_unhook_swapchain(swapchain); + wined3d_swapchain_state_unregister(&swapchain->state); wined3d_swapchain_set_gamma_ramp(swapchain, 0, &swapchain->orig_gamma); /* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0] @@ -1288,7 +1288,7 @@ static enum wined3d_format_id adapter_format_from_backbuffer_format(const struct } static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *state, - const struct wined3d_swapchain_desc *desc, HWND window) + const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d *wined3d) { HRESULT hr; @@ -1320,6 +1320,9 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat GetWindowRect(window, &state->original_window_rect); state->device_window = window; + if (desc->flags & WINED3D_SWAPCHAIN_REGISTER_STATE) + wined3d_swapchain_state_register(state, wined3d); + return hr; } @@ -1350,7 +1353,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); window = desc->device_window ? desc->device_window : device->create_parms.focus_window; - if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window))) + if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d))) { ERR("Failed to initialise swapchain state, hr %#x.\n", hr); goto err; @@ -1627,9 +1630,6 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct win desc, parent, parent_ops, &object))) return hr; - if (desc->flags & WINED3D_SWAPCHAIN_HOOK) - wined3d_hook_swapchain(object); - if (desc->flags & WINED3D_SWAPCHAIN_IMPLICIT) { wined3d_mutex_lock(); @@ -2275,21 +2275,22 @@ BOOL CDECL wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_st void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state) { + wined3d_swapchain_state_unregister(state); heap_free(state); } HRESULT CDECL wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, - HWND window, struct wined3d_swapchain_state **state) + HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state **state) { struct wined3d_swapchain_state *s; HRESULT hr; - TRACE("desc %p, window %p, state %p.\n", desc, window, state); + TRACE("desc %p, window %p, wined3d %p, state %p.\n", desc, window, wined3d, state); if (!(s = heap_alloc_zero(sizeof(*s)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window))) + if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window, wined3d))) { heap_free(s); return hr; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d11e06d0c34..77b22b3c907 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -289,7 +289,7 @@ @ cdecl wined3d_swapchain_set_palette(ptr ptr) @ cdecl wined3d_swapchain_set_window(ptr ptr) -@ cdecl wined3d_swapchain_state_create(ptr ptr ptr) +@ cdecl wined3d_swapchain_state_create(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_is_windowed(ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index c98aee18bdd..001b7dd1255 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -56,25 +56,26 @@ struct wined3d_window_hook unsigned int count; }; -struct wined3d_hooked_swapchain +struct wined3d_registered_swapchain_state { - struct wined3d_swapchain *swapchain; + struct wined3d_swapchain_state *state; + struct wined3d *wined3d; DWORD thread_id; }; -struct wined3d_hook_table +struct wined3d_swapchain_state_table { struct wined3d_window_hook *hooks; SIZE_T hooks_size; SIZE_T hook_count; - struct wined3d_hooked_swapchain *swapchains; - SIZE_T swapchains_size; - SIZE_T swapchain_count; + struct wined3d_registered_swapchain_state *states; + SIZE_T states_size; + SIZE_T state_count; }; static struct wined3d_wndproc_table wndproc_table; -static struct wined3d_hook_table hook_table; +static struct wined3d_swapchain_state_table swapchain_state_table; static CRITICAL_SECTION wined3d_cs; static CRITICAL_SECTION_DEBUG wined3d_cs_debug = @@ -425,13 +426,13 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) } heap_free(wndproc_table.entries); - heap_free(hook_table.swapchains); - for (i = 0; i < hook_table.hook_count; ++i) + heap_free(swapchain_state_table.states); + for (i = 0; i < swapchain_state_table.hook_count; ++i) { - WARN("Leftover hook table entry %p.\n", &hook_table.hooks[i]); - UnhookWindowsHookEx(hook_table.hooks[i].hook); + WARN("Leftover swapchain state hook %p.\n", &swapchain_state_table.hooks[i]); + UnhookWindowsHookEx(swapchain_state_table.hooks[i].hook); } - heap_free(hook_table.hooks); + heap_free(swapchain_state_table.hooks); heap_free(wined3d_settings.logo); UnregisterClassA(WINED3D_OPENGL_WINDOW_CLASS_NAME, hInstDLL); @@ -573,8 +574,8 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam) { + struct wined3d_registered_swapchain_state *registered_state; struct wined3d_swapchain_desc swapchain_desc; - struct wined3d_swapchain *swapchain; struct wined3d_wndproc *entry; struct wined3d_output *output; MSG *msg = (MSG *)lparam; @@ -586,28 +587,28 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam { wined3d_wndproc_mutex_lock(); - for (i = 0; i < hook_table.swapchain_count; ++i) + for (i = 0; i < swapchain_state_table.state_count; ++i) { - swapchain = hook_table.swapchains[i].swapchain; + registered_state = &swapchain_state_table.states[i]; - if (swapchain->state.device_window != msg->hwnd) + if (registered_state->state->device_window != msg->hwnd) continue; - if ((entry = wined3d_find_wndproc(msg->hwnd, swapchain->device->wined3d)) + if ((entry = wined3d_find_wndproc(msg->hwnd, registered_state->wined3d)) && (entry->flags & (WINED3D_REGISTER_WINDOW_NO_WINDOW_CHANGES | WINED3D_REGISTER_WINDOW_NO_ALT_ENTER))) continue; - wined3d_swapchain_get_desc(swapchain, &swapchain_desc); + swapchain_desc = registered_state->state->desc; swapchain_desc.windowed = !swapchain_desc.windowed; - if (!(output = wined3d_get_output_from_window(swapchain->device->wined3d, - swapchain->state.device_window))) + if (!(output = wined3d_get_output_from_window(registered_state->wined3d, + registered_state->state->device_window))) { - ERR("Failed to get output from window %p.\n", swapchain->state.device_window); + ERR("Failed to get output from window %p.\n", registered_state->state->device_window); break; } swapchain_desc.output = output; - wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, NULL); + wined3d_swapchain_state_set_fullscreen(registered_state->state, &swapchain_desc, NULL); wined3d_wndproc_mutex_unlock(); @@ -764,82 +765,84 @@ static struct wined3d_window_hook *wined3d_find_hook(DWORD thread_id) { unsigned int i; - for (i = 0; i < hook_table.hook_count; ++i) + for (i = 0; i < swapchain_state_table.hook_count; ++i) { - if (hook_table.hooks[i].thread_id == thread_id) - return &hook_table.hooks[i]; + if (swapchain_state_table.hooks[i].thread_id == thread_id) + return &swapchain_state_table.hooks[i]; } return NULL; } -void wined3d_hook_swapchain(struct wined3d_swapchain *swapchain) +void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, + struct wined3d *wined3d) { - struct wined3d_hooked_swapchain *swapchain_entry; + struct wined3d_registered_swapchain_state *state_entry; struct wined3d_window_hook *hook; wined3d_wndproc_mutex_lock(); - if (!wined3d_array_reserve((void **)&hook_table.swapchains, &hook_table.swapchains_size, - hook_table.swapchain_count + 1, sizeof(*swapchain_entry))) + if (!wined3d_array_reserve((void **)&swapchain_state_table.states, &swapchain_state_table.states_size, + swapchain_state_table.state_count + 1, sizeof(*state_entry))) { wined3d_wndproc_mutex_unlock(); return; } - swapchain_entry = &hook_table.swapchains[hook_table.swapchain_count++]; - swapchain_entry->swapchain = swapchain; - swapchain_entry->thread_id = GetWindowThreadProcessId(swapchain->state.device_window, NULL); + state_entry = &swapchain_state_table.states[swapchain_state_table.state_count++]; + state_entry->state = state; + state_entry->wined3d = wined3d; + state_entry->thread_id = GetWindowThreadProcessId(state->device_window, NULL); - if ((hook = wined3d_find_hook(swapchain_entry->thread_id))) + if ((hook = wined3d_find_hook(state_entry->thread_id))) { ++hook->count; wined3d_wndproc_mutex_unlock(); return; } - if (!wined3d_array_reserve((void **)&hook_table.hooks, &hook_table.hooks_size, - hook_table.hook_count + 1, sizeof(*hook))) + if (!wined3d_array_reserve((void **)&swapchain_state_table.hooks, &swapchain_state_table.hooks_size, + swapchain_state_table.hook_count + 1, sizeof(*hook))) { - --hook_table.swapchain_count; + --swapchain_state_table.state_count; wined3d_wndproc_mutex_unlock(); return; } - hook = &hook_table.hooks[hook_table.hook_count++]; - hook->thread_id = swapchain_entry->thread_id; + hook = &swapchain_state_table.hooks[swapchain_state_table.hook_count++]; + hook->thread_id = state_entry->thread_id; hook->hook = SetWindowsHookExW(WH_GETMESSAGE, wined3d_hook_proc, 0, hook->thread_id); hook->count = 1; wined3d_wndproc_mutex_unlock(); } -void wined3d_unhook_swapchain(struct wined3d_swapchain *swapchain) +void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) { - struct wined3d_hooked_swapchain *swapchain_entry, *last_swapchain_entry; + struct wined3d_registered_swapchain_state *state_entry, *last_state_entry; struct wined3d_window_hook *hook, *last_hook; unsigned int i; wined3d_wndproc_mutex_lock(); - for (i = 0; i < hook_table.swapchain_count; ++i) + for (i = 0; i < swapchain_state_table.state_count; ++i) { - swapchain_entry = &hook_table.swapchains[i]; + state_entry = &swapchain_state_table.states[i]; - if (swapchain_entry->swapchain != swapchain) + if (state_entry->state != state) continue; - if ((hook = wined3d_find_hook(swapchain_entry->thread_id)) && !--hook->count) + if ((hook = wined3d_find_hook(state_entry->thread_id)) && !--hook->count) { UnhookWindowsHookEx(hook->hook); - last_hook = &hook_table.hooks[--hook_table.hook_count]; + last_hook = &swapchain_state_table.hooks[--swapchain_state_table.hook_count]; if (hook != last_hook) *hook = *last_hook; } - last_swapchain_entry = &hook_table.swapchains[--hook_table.swapchain_count]; - if (swapchain_entry != last_swapchain_entry) - *swapchain_entry = *last_swapchain_entry; + last_state_entry = &swapchain_state_table.states[--swapchain_state_table.state_count]; + if (state_entry != last_state_entry) + *state_entry = *last_state_entry; break; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d932f60fa95..bbb0a60d7bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3522,9 +3522,7 @@ struct wined3d }; BOOL wined3d_filter_messages(HWND window, BOOL filter) DECLSPEC_HIDDEN; -void wined3d_hook_swapchain(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; -void wined3d_unhook_swapchain(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) DECLSPEC_HIDDEN; @@ -5082,10 +5080,13 @@ struct wined3d_swapchain_state HWND device_window; }; +void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, + struct wined3d *wined3d) DECLSPEC_HIDDEN; void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, HWND window, int x, int y, int width, int height) DECLSPEC_HIDDEN; +void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; struct wined3d_swapchain_ops { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 238961006a0..61ab0e90953 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -904,7 +904,7 @@ enum wined3d_shader_type #define WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT 0x00004000u #define WINED3D_SWAPCHAIN_GDI_COMPATIBLE 0x00008000u #define WINED3D_SWAPCHAIN_IMPLICIT 0x00010000u -#define WINED3D_SWAPCHAIN_HOOK 0x00020000u +#define WINED3D_SWAPCHAIN_REGISTER_STATE 0x00020000u #define WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES 0x00040000u #define WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE 0x00080000u @@ -2804,7 +2804,7 @@ void __cdecl wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, - HWND window, struct wined3d_swapchain_state **state); + HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); BOOL __cdecl wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, -- 2.25.1

2 1

[PATCH vkd3d v2 1/3] vkd3d-shader: Pass the output pointer to vkd3d_shader_message_context_copy_messages().
by Zebediah Figura 09 Oct '20

09 Oct '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_main.c | 20 +++++++++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 93e7eaf5..3ddca1e9 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2786,7 +2786,7 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, rts0_handler, root_signature); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); @@ -3390,7 +3390,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro done: vkd3d_shader_message_context_trace_messages(&context.message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&context.message_context))) + if (!vkd3d_shader_message_context_copy_messages(&context.message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&context.message_context); return ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index c2fe2c8e..d3d86ed7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -140,14 +140,20 @@ void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_mess vkd3d_string_buffer_trace_(&context->messages, function); } -char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) +bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, char **out) { char *messages; - if ((messages = vkd3d_malloc(context->messages.content_size + 1))) - memcpy(messages, context->messages.buffer, context->messages.content_size + 1); + if (!out) + return true; - return messages; + *out = NULL; + + if (!(messages = vkd3d_malloc(context->messages.content_size + 1))) + return false; + memcpy(messages, context->messages.buffer, context->messages.content_size + 1); + *out = messages; + return true; } void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, @@ -842,7 +848,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char ret = scan_dxbc(compile_info, &message_context); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); return ret; @@ -956,7 +962,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, } vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); return ret; @@ -1046,7 +1052,7 @@ int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f88ea69a..98b5fbc4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -848,7 +848,8 @@ struct vkd3d_shader_message_context }; void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; -char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; +bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, + char **out) DECLSPEC_HIDDEN; bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN; void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, -- 2.28.0

2 5

[PATCH 1/3] ntdll: Support AVX registers for other thread in Nt{Get|Set}ContextThread().
by Paul Gofman 09 Oct '20

09 Oct '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/server.c | 7 +++++ dlls/ntdll/unix/signal_i386.c | 31 +++++++++++------- dlls/ntdll/unix/signal_x86_64.c | 35 ++++++++++++++------- dlls/ntdll/unix/thread.c | 36 ++++++++++++++++++--- dlls/ntdll/unix/unix_private.h | 56 ++++++++++++++++++++++++++++----- include/wine/server_protocol.h | 5 +++ server/protocol.def | 5 +++ server/thread.c | 1 + server/trace.c | 6 ++++ 9 files changed, 148 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 81a903ca77a..7236f0acb83 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -631,8 +631,15 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT if (wine_server_reply_size( reply )) { DWORD context_flags = context->ContextFlags; /* unchanged registers are still available */ + XSTATE *xs = xstate_from_context( context ); + ULONG64 mask; + + if (xs) + mask = xs->Mask; context_from_server( context, &server_context ); context->ContextFlags |= context_flags; + if (xs) + xs->Mask |= mask; } } SERVER_END_REQ; diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index e0ba27d3e94..4d8eeb2072c 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -886,14 +886,16 @@ static inline void save_context( struct xcontext *xcontext, const ucontext_t *si } if (fpux) { + XSTATE *xs; + context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) ); if (!fpu) fpux_to_fpu( &context->FloatSave, fpux ); - xcontext->xstate = XState_sig(fpux); - } - else - { - xcontext->xstate = NULL; + if ((xs = XState_sig(fpux))) + { + context_init_xstate( context, xs ); + xcontext->host_compaction_mask = xs->CompactionMask; + } } if (!fpu && !fpux) save_fpu( context ); } @@ -944,6 +946,7 @@ static inline void restore_context( const struct xcontext *xcontext, ucontext_t { memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); dst_xs->Mask |= src_xs->Mask; + dst_xs->CompactionMask = xcontext->host_compaction_mask; } } if (!fpu && !fpux) restore_fpu( context ); @@ -1023,6 +1026,7 @@ static unsigned int get_server_context_flags( DWORD flags ) if (flags & CONTEXT_FLOATING_POINT) ret |= SERVER_CTX_FLOATING_POINT; if (flags & CONTEXT_DEBUG_REGISTERS) ret |= SERVER_CTX_DEBUG_REGISTERS; if (flags & CONTEXT_EXTENDED_REGISTERS) ret |= SERVER_CTX_EXTENDED_REGISTERS; + if (flags & CONTEXT_XSTATE) ret |= SERVER_CTX_YMM_REGISTERS; return ret; } @@ -1095,6 +1099,7 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) to->flags |= SERVER_CTX_EXTENDED_REGISTERS; memcpy( to->ext.i386_regs, from->ExtendedRegisters, sizeof(to->ext.i386_regs) ); } + xstate_to_server( to, xstate_from_context( from ) ); return STATUS_SUCCESS; } @@ -1108,7 +1113,7 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) { if (from->cpu != CPU_x86) return STATUS_INVALID_PARAMETER; - to->ContextFlags = CONTEXT_i386; + to->ContextFlags = CONTEXT_i386 | (to->ContextFlags & 0x40); if (from->flags & SERVER_CTX_CONTROL) { to->ContextFlags |= CONTEXT_CONTROL; @@ -1165,6 +1170,7 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) to->ContextFlags |= CONTEXT_EXTENDED_REGISTERS; memcpy( to->ExtendedRegisters, from->ext.i386_regs, sizeof(to->ExtendedRegisters) ); } + xstate_from_server( xstate_from_context( to ), from ); return STATUS_SUCCESS; } @@ -1246,7 +1252,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) /* Save xstate before any calls which can potentially change volatile ymm registers. * E. g., debug output will clobber ymm registers. */ - xsave_status = self ? save_xstate( context ) : STATUS_SUCCESS; /* FIXME: other thread. */ + xsave_status = self ? save_xstate( context ) : STATUS_SUCCESS; /* debug registers require a server call */ if (needed_flags & CONTEXT_DEBUG_REGISTERS) self = FALSE; @@ -1293,7 +1299,6 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } if (needed_flags & CONTEXT_FLOATING_POINT) save_fpu( context ); if (needed_flags & CONTEXT_EXTENDED_REGISTERS) save_fpux( context ); - /* FIXME: xstate */ /* update the cached version of the debug registers */ if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)) { @@ -1579,6 +1584,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr, { CONTEXT *context = &xcontext->c; size_t stack_size; + XSTATE *src_xs; struct stack_layout { @@ -1606,7 +1612,7 @@ C_ASSERT( (offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout)) if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--; stack_size = sizeof(*stack); - if (xcontext->xstate) + if ((src_xs = xstate_from_context( context ))) { stack_size += (ULONG_PTR)stack_ptr - (((ULONG_PTR)stack_ptr - sizeof(XSTATE)) & ~(ULONG_PTR)63); @@ -1616,17 +1622,18 @@ C_ASSERT( (offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout)) stack->rec = *rec; stack->context = *context; - if (xcontext->xstate) + if (src_xs) { XSTATE *dst_xs = (XSTATE *)stack->xstate; assert(!((ULONG_PTR)dst_xs & 63)); context_init_xstate( &stack->context, stack->xstate ); + memset( dst_xs, 0, offsetof(XSTATE, YmmContext) ); dst_xs->CompactionMask = user_shared_data->XState.CompactionEnabled ? 0x8000000000000004 : 0; - if (xcontext->xstate->Mask & 4) + if (src_xs->Mask & 4) { dst_xs->Mask = 4; - memcpy( &dst_xs->YmmContext, &xcontext->xstate->YmmContext, sizeof(dst_xs->YmmContext) ); + memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); } } diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index e11b2c70b59..030f8cc6feb 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1461,14 +1461,19 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex context->Dr7 = amd64_thread_data()->dr7; if (FPU_sig(sigcontext)) { + XSTATE *xs; + context->ContextFlags |= CONTEXT_FLOATING_POINT; context->u.FltSave = *FPU_sig(sigcontext); context->MxCsr = context->u.FltSave.MxCsr; - xcontext->xstate = XState_sig(FPU_sig(sigcontext)); - } - else - { - xcontext->xstate = NULL; + if ((xs = XState_sig(FPU_sig(sigcontext)))) + { + /* xcontext and sigcontext are both on the signal stack, so we can + * just reference sigcontext without overflowing 32 bit XState.Offset */ + context_init_xstate( context, xs ); + assert( xcontext->c_ex.XState.Offset == (BYTE *)xs - (BYTE *)&xcontext->c_ex ); + xcontext->host_compaction_mask = xs->CompactionMask; + } } } @@ -1531,6 +1536,7 @@ static inline NTSTATUS save_xstate( CONTEXT *context ) static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcontext ) { const CONTEXT *context = &xcontext->c; + XSTATE *xs; amd64_thread_data()->dr0 = context->Dr0; amd64_thread_data()->dr1 = context->Dr1; @@ -1540,6 +1546,8 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon amd64_thread_data()->dr7 = context->Dr7; set_sigcontext( context, sigcontext ); if (FPU_sig(sigcontext)) *FPU_sig(sigcontext) = context->u.FltSave; + if ((xs = XState_sig(FPU_sig(sigcontext)))) + xs->CompactionMask = xcontext->host_compaction_mask; } @@ -1628,6 +1636,7 @@ static unsigned int get_server_context_flags( DWORD flags ) if (flags & CONTEXT_SEGMENTS) ret |= SERVER_CTX_SEGMENTS; if (flags & CONTEXT_FLOATING_POINT) ret |= SERVER_CTX_FLOATING_POINT; if (flags & CONTEXT_DEBUG_REGISTERS) ret |= SERVER_CTX_DEBUG_REGISTERS; + if (flags & CONTEXT_XSTATE) ret |= SERVER_CTX_YMM_REGISTERS; return ret; } @@ -1695,6 +1704,7 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) to->debug.x86_64_regs.dr6 = from->Dr6; to->debug.x86_64_regs.dr7 = from->Dr7; } + xstate_to_server( to, xstate_from_context( from ) ); return STATUS_SUCCESS; } @@ -1708,7 +1718,7 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) { if (from->cpu != CPU_x86_64) return STATUS_INVALID_PARAMETER; - to->ContextFlags = CONTEXT_AMD64; + to->ContextFlags = CONTEXT_AMD64 | (to->ContextFlags & 0x40); if (from->flags & SERVER_CTX_CONTROL) { to->ContextFlags |= CONTEXT_CONTROL; @@ -1762,6 +1772,7 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) to->Dr6 = from->debug.x86_64_regs.dr6; to->Dr7 = from->debug.x86_64_regs.dr7; } + xstate_from_server( xstate_from_context( to ), from ); return STATUS_SUCCESS; } @@ -1831,7 +1842,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) /* Save xstate before any calls which can potentially change volatile ymm registers. * E. g., debug output will clobber ymm registers. */ - xsave_status = self ? save_xstate( context ) : STATUS_SUCCESS; /* FIXME: other thread. */ + xsave_status = self ? save_xstate( context ) : STATUS_SUCCESS; needed_flags = context->ContextFlags & ~CONTEXT_AMD64; @@ -1924,6 +1935,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec struct stack_layout *stack; size_t stack_size; NTSTATUS status; + XSTATE *src_xs; if (rec->ExceptionCode == EXCEPTION_SINGLE_STEP) { @@ -1953,7 +1965,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; stack_size = sizeof(*stack); - if (xcontext->xstate) + if ((src_xs = xstate_from_context( context ))) { stack_size += (ULONG_PTR)stack_ptr - (((ULONG_PTR)stack_ptr - sizeof(XSTATE)) & ~(ULONG_PTR)63); @@ -1962,17 +1974,18 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec stack = virtual_setup_exception( stack_ptr, stack_size, rec ); stack->rec = *rec; stack->context = *context; - if (xcontext->xstate) + if (src_xs) { XSTATE *dst_xs = (XSTATE *)stack->xstate; assert( !((ULONG_PTR)dst_xs & 63) ); context_init_xstate( &stack->context, stack->xstate ); + memset( dst_xs, 0, offsetof(XSTATE, YmmContext) ); dst_xs->CompactionMask = user_shared_data->XState.CompactionEnabled ? 0x8000000000000004 : 0; - if (xcontext->xstate->Mask & 4) + if (src_xs->Mask & 4) { dst_xs->Mask = 4; - memcpy( &dst_xs->YmmContext, &xcontext->xstate->YmmContext, sizeof(dst_xs->YmmContext) ); + memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); } } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index ded4b33eb01..a161c5d1c90 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -344,7 +344,6 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_c DWORD i; obj_handle_t handle = 0; client_ptr_t params[EXCEPTION_MAXIMUM_PARAMETERS]; - CONTEXT exception_context = *context; select_op_t select_op; sigset_t old_set; @@ -370,10 +369,22 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_c if (handle) { + struct xcontext exception_context; + DECLSPEC_ALIGN(64) XSTATE xs; + XSTATE *src_xs; + select_op.wait.op = SELECT_WAIT; select_op.wait.handles[0] = handle; + + exception_context.c = *context; + if ((src_xs = xstate_from_context( context ))) + { + context_init_xstate( &exception_context.c, &xs ); + memcpy( &xs, src_xs, sizeof(xs) ); + } + server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, - TIMEOUT_INFINITE, &exception_context, NULL, NULL ); + TIMEOUT_INFINITE, &exception_context.c, NULL, NULL ); SERVER_START_REQ( get_exception_status ) { @@ -381,7 +392,12 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_c ret = wine_server_call( req ); } SERVER_END_REQ; - if (ret >= 0) *context = exception_context; + if (ret >= 0) + { + *context = exception_context.c; + if (src_xs) + memcpy( src_xs, &xs, sizeof(xs) ); + } } pthread_sigmask( SIG_SETMASK, &old_set, NULL ); @@ -632,7 +648,7 @@ static NTSTATUS wow64_context_from_server( WOW64_CONTEXT *to, const context_t *f { if (from->cpu != CPU_x86) return STATUS_INVALID_PARAMETER; - to->ContextFlags = WOW64_CONTEXT_i386; + to->ContextFlags = WOW64_CONTEXT_i386 | (to->ContextFlags & 0x40); if (from->flags & SERVER_CTX_CONTROL) { to->ContextFlags |= WOW64_CONTEXT_CONTROL; @@ -689,6 +705,12 @@ static NTSTATUS wow64_context_from_server( WOW64_CONTEXT *to, const context_t *f to->ContextFlags |= WOW64_CONTEXT_EXTENDED_REGISTERS; memcpy( to->ExtendedRegisters, from->ext.i386_regs, sizeof(to->ExtendedRegisters) ); } + if ((to->ContextFlags & WOW64_CONTEXT_XSTATE) == WOW64_CONTEXT_XSTATE) + { + CONTEXT_EX *c_ex = (CONTEXT_EX *)(to + 1); + + xstate_from_server( (XSTATE *)((BYTE *)c_ex + c_ex->XState.Offset), from ); + } return STATUS_SUCCESS; } @@ -758,6 +780,12 @@ static void wow64_context_to_server( context_t *to, const WOW64_CONTEXT *from ) to->flags |= SERVER_CTX_EXTENDED_REGISTERS; memcpy( to->ext.i386_regs, from->ExtendedRegisters, sizeof(to->ext.i386_regs) ); } + if (flags & WOW64_CONTEXT_XSTATE) + { + CONTEXT_EX *c_ex = (CONTEXT_EX *)(from + 1); + + xstate_to_server( to, (XSTATE *)((BYTE *)c_ex + c_ex->XState.Offset) ); + } } #endif /* __x86_64__ */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index f99c13fe2ad..c3ad0a41098 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -288,13 +288,14 @@ static inline void mutex_unlock( pthread_mutex_t *mutex ) static inline TEB64 *NtCurrentTeb64(void) { return (TEB64 *)NtCurrentTeb()->GdiBatchCount; } #endif -#if defined(__i386__) || defined(__x86_64__) struct xcontext { CONTEXT c; - XSTATE *xstate; /* points to xstate in sigcontext */ + CONTEXT_EX c_ex; + ULONG64 host_compaction_mask; }; +#if defined(__i386__) || defined(__x86_64__) static inline XSTATE *xstate_from_context( const CONTEXT *context ) { CONTEXT_EX *xctx = (CONTEXT_EX *)(context + 1); @@ -308,21 +309,62 @@ static inline XSTATE *xstate_from_context( const CONTEXT *context ) static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) { CONTEXT_EX *xctx; - XSTATE *xs; xctx = (CONTEXT_EX *)(context + 1); xctx->Legacy.Length = sizeof(CONTEXT); xctx->Legacy.Offset = -(LONG)sizeof(CONTEXT); xctx->XState.Length = sizeof(XSTATE); - xctx->XState.Offset = xstate_buffer ? (((ULONG_PTR)xstate_buffer + 63) & ~63) - (ULONG_PTR)xctx - : (((ULONG_PTR)context + sizeof(CONTEXT) + sizeof(CONTEXT_EX) + 63) & ~63) - (ULONG_PTR)xctx; + xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; xctx->All.Offset = -(LONG)sizeof(CONTEXT); context->ContextFlags |= 0x40; +} - xs = xstate_from_context(context); - memset( xs, 0, offsetof(XSTATE, YmmContext) ); +static inline void xstate_to_server( context_t *to, const XSTATE *xs ) +{ + if (!xs) + return; + + to->flags |= SERVER_CTX_YMM_REGISTERS; + if (xs->Mask & 4) + memcpy(&to->ymm.ymm_high_regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext)); + else + memset(&to->ymm.ymm_high_regs.ymm_high, 0, sizeof(xs->YmmContext)); +} + +static inline void xstate_from_server_( XSTATE *xs, const context_t *from, BOOL compaction_enabled) +{ + if (!xs) + return; + + xs->Mask = 0; + xs->CompactionMask = compaction_enabled ? 0x8000000000000004 : 0; + + if (from->flags & SERVER_CTX_YMM_REGISTERS) + { + unsigned long *src = (unsigned long *)&from->ymm.ymm_high_regs.ymm_high; + unsigned int i; + + for (i = 0; i < sizeof(xs->YmmContext) / sizeof(unsigned long); ++i) + if (src[i]) + { + memcpy( &xs->YmmContext, &from->ymm.ymm_high_regs.ymm_high, sizeof(xs->YmmContext) ); + xs->Mask = 4; + break; + } + } +} +#define xstate_from_server( xs, from ) xstate_from_server_( xs, from, user_shared_data->XState.CompactionEnabled ) + +#else +static inline XSTATE *xstate_from_context( const CONTEXT *context ) +{ + return NULL; +} +static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) +{ } #endif diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 751ca59ad6b..5e267195f20 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -170,6 +170,10 @@ typedef struct { unsigned char i386_regs[512]; } ext; + union + { + struct { struct { unsigned __int64 low, high; } ymm_high[16]; } ymm_high_regs; + } ymm; } context_t; #define SERVER_CTX_CONTROL 0x01 @@ -178,6 +182,7 @@ typedef struct #define SERVER_CTX_FLOATING_POINT 0x08 #define SERVER_CTX_DEBUG_REGISTERS 0x10 #define SERVER_CTX_EXTENDED_REGISTERS 0x20 +#define SERVER_CTX_YMM_REGISTERS 0x40 struct send_fd diff --git a/server/protocol.def b/server/protocol.def index 16c0b936743..305a1d0186f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -186,6 +186,10 @@ typedef struct { unsigned char i386_regs[512]; } ext; /* selected by SERVER_CTX_EXTENDED_REGISTERS */ + union + { + struct { struct { unsigned __int64 low, high; } ymm_high[16]; } ymm_high_regs; + } ymm; /* selected by SERVER_CTX_YMM_REGISTERS */ } context_t; #define SERVER_CTX_CONTROL 0x01 @@ -194,6 +198,7 @@ typedef struct #define SERVER_CTX_FLOATING_POINT 0x08 #define SERVER_CTX_DEBUG_REGISTERS 0x10 #define SERVER_CTX_EXTENDED_REGISTERS 0x20 +#define SERVER_CTX_YMM_REGISTERS 0x40 /* structure used in sending an fd from client to server */ struct send_fd diff --git a/server/thread.c b/server/thread.c index eb138079739..942a8ff8389 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1285,6 +1285,7 @@ static void copy_context( context_t *to, const context_t *from, unsigned int fla if (flags & SERVER_CTX_FLOATING_POINT) to->fp = from->fp; if (flags & SERVER_CTX_DEBUG_REGISTERS) to->debug = from->debug; if (flags & SERVER_CTX_EXTENDED_REGISTERS) to->ext = from->ext; + if (flags & SERVER_CTX_YMM_REGISTERS) to->ymm = from->ymm; } /* return the context flags that correspond to system regs */ diff --git a/server/trace.c b/server/trace.c index 17dd415b958..8ee0bc8c3e3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -620,6 +620,9 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) if (ctx.flags & SERVER_CTX_EXTENDED_REGISTERS) dump_uints( ",extended=", (const unsigned int *)ctx.ext.i386_regs, sizeof(ctx.ext.i386_regs) / sizeof(int) ); + if (ctx.flags & SERVER_CTX_YMM_REGISTERS) + dump_uints( ",ymm_high=", (const unsigned int *)ctx.ymm.ymm_high_regs.ymm_high, + sizeof(ctx.ymm.ymm_high_regs) / sizeof(int) ); break; case CPU_x86_64: if (ctx.flags & SERVER_CTX_CONTROL) @@ -669,6 +672,9 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) (unsigned int)(ctx.fp.x86_64_regs.fpregs[i].low >> 32), (unsigned int)ctx.fp.x86_64_regs.fpregs[i].low ); } + if (ctx.flags & SERVER_CTX_YMM_REGISTERS) + dump_uints( ",ymm_high=", (const unsigned int *)ctx.ymm.ymm_high_regs.ymm_high, + sizeof(ctx.ymm.ymm_high_regs) / sizeof(int) ); break; case CPU_POWERPC: if (ctx.flags & SERVER_CTX_CONTROL) -- 2.26.2

1 2

[PATCH 2/2] kernelbase: Remove DECLSPEC_HOTPATCH for GetCommandLine[AW].
by Myah Caron 09 Oct '20

09 Oct '20

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=48861 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/kernelbase/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index d5fedb4495c..0f707f82d11 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1278,7 +1278,7 @@ BOOL WINAPI BaseFlushAppcompatCache(void) /*********************************************************************** * GetCommandLineA (kernelbase.@) */ -LPSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineA(void) +LPSTR WINAPI GetCommandLineA(void) { return command_lineA; } @@ -1287,7 +1287,7 @@ LPSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineA(void) /*********************************************************************** * GetCommandLineW (kernelbase.@) */ -LPWSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineW(void) +LPWSTR WINAPI GetCommandLineW(void) { return command_lineW; } -- 2.28.0

1 0

[PATCH 5/5] riched20: Use ME_Paragraph ptrs in a few of the table functions.
by Huw Davies 09 Oct '20

09 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 6 ++--- dlls/riched20/editor.h | 8 +++--- dlls/riched20/paint.c | 4 +-- dlls/riched20/para.c | 13 ++++++++++ dlls/riched20/table.c | 57 ++++++++++++++++++------------------------ dlls/riched20/wrap.c | 9 +++---- dlls/riched20/writer.c | 4 +-- 7 files changed, 54 insertions(+), 47 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 89fd9d7326c..e9ea64ed1bc 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1033,7 +1033,7 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, } else if (p->member.para.nFlags & MEPF_ROWSTART) { - p = ME_GetTableRowEnd(p); + p = para_get_di( table_row_end( &p->member.para ) ); } } /* find row */ @@ -1304,7 +1304,7 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL pOldPara->member.para.pCell != pNewPara->member.para.pCell)) { /* Brought out of a cell */ - pNewPara = ME_GetTableRowStart(pOldPara)->member.para.prev_para; + pNewPara = table_row_start( &pOldPara->member.para )->prev_para; if (pNewPara->type == diTextStart) return; /* At the top, so don't go anywhere. */ pItem = ME_FindItemFwd(pNewPara, diStartRow); @@ -1335,7 +1335,7 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL pOldPara->member.para.pCell != pNewPara->member.para.pCell)) { /* Brought out of a cell */ - pNewPara = ME_GetTableRowEnd(pOldPara)->member.para.next_para; + pNewPara = table_row_end( &pOldPara->member.para )->next_para; if (pNewPara->type == diTextEnd) return; /* At the bottom, so don't go anywhere. */ pItem = ME_FindItemFwd(pNewPara, diStartRow); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e7687272510..910a87c33c4 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -211,6 +211,8 @@ int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Paragraph *para_next( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Paragraph *para_prev( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; static inline ME_DisplayItem *para_get_di(ME_Paragraph *para) { @@ -273,9 +275,9 @@ ME_DisplayItem *ME_InsertTableRowStartAtParagraph(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; ME_DisplayItem *ME_InsertTableCellFromCursor(ME_TextEditor *editor) DECLSPEC_HIDDEN; ME_DisplayItem *ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_GetTableRowEnd(ME_DisplayItem *para) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_GetTableRowStart(ME_DisplayItem *para) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_GetOuterParagraph(ME_DisplayItem *para) DECLSPEC_HIDDEN; +ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nChars) DECLSPEC_HIDDEN; ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, ME_DisplayItem *table_row) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 72128072380..53583de21ce 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -778,10 +778,10 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) if (atBottom) { int oldLeft = rc.left; width = max(ME_twips2pointsY(c, cell->border.bottom.width), 1); - paraAfterRow = ME_GetTableRowEnd(paragraph)->member.para.next_para; + paraAfterRow = table_row_end( &paragraph->member.para )->next_para; if (paraAfterRow->member.para.nFlags & MEPF_ROWSTART) { ME_DisplayItem *nextEndCell; - nextEndCell = ME_FindItemBack(ME_GetTableRowEnd(paraAfterRow), diCell); + nextEndCell = ME_FindItemBack( para_get_di( table_row_end( &paraAfterRow->member.para ) ), diCell ); assert(nextEndCell && !nextEndCell->member.cell.next_cell); rc.left = c->pt.x + nextEndCell->member.cell.pt.x; /* FIXME: Native draws FROM the bottom of the table rather than diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 58dcfc8e712..0f8b76f76d0 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -55,6 +55,19 @@ void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) ME_DestroyDisplayItem(item); } +/* Note para_next/prev will return the start and end doc nodes */ +ME_Paragraph *para_next( ME_Paragraph *para ) +{ + if (para->next_para) return &para->next_para->member.para; + return NULL; +} + +ME_Paragraph *para_prev( ME_Paragraph *para ) +{ + if (para->prev_para) return &para->prev_para->member.para; + return NULL; +} + int get_total_width(ME_TextEditor *editor) { ME_Paragraph *para; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 1b4b9143d16..615145b85e8 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -133,52 +133,46 @@ ME_DisplayItem* ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) return para->member.para.prev_para; } -ME_DisplayItem* ME_GetTableRowEnd(ME_DisplayItem *para) +ME_Paragraph* table_row_end( ME_Paragraph *para ) { ME_DisplayItem *cell; - assert(para); - if (para->member.para.nFlags & MEPF_ROWEND) - return para; - if (para->member.para.nFlags & MEPF_ROWSTART) - para = para->member.para.next_para; - cell = para->member.para.pCell; + assert( para ); + if (para->nFlags & MEPF_ROWEND) return para; + if (para->nFlags & MEPF_ROWSTART) para = para_next( para ); + cell = para->pCell; assert(cell && cell->type == diCell); while (cell->member.cell.next_cell) cell = cell->member.cell.next_cell; - para = ME_FindItemFwd(cell, diParagraph); - assert(para && para->member.para.nFlags & MEPF_ROWEND); + para = &ME_FindItemFwd( cell, diParagraph )->member.para; + assert( para && para->nFlags & MEPF_ROWEND ); return para; } -ME_DisplayItem* ME_GetTableRowStart(ME_DisplayItem *para) +ME_Paragraph* table_row_start( ME_Paragraph *para ) { ME_DisplayItem *cell; - assert(para); - if (para->member.para.nFlags & MEPF_ROWSTART) - return para; - if (para->member.para.nFlags & MEPF_ROWEND) - para = para->member.para.prev_para; - cell = para->member.para.pCell; + assert( para ); + if (para->nFlags & MEPF_ROWSTART) return para; + if (para->nFlags & MEPF_ROWEND) para = para_prev( para ); + cell = para->pCell; assert(cell && cell->type == diCell); while (cell->member.cell.prev_cell) cell = cell->member.cell.prev_cell; - para = ME_FindItemBack(cell, diParagraph); - assert(para && para->member.para.nFlags & MEPF_ROWSTART); + para = &ME_FindItemBack( cell, diParagraph )->member.para; + assert( para && para->nFlags & MEPF_ROWSTART ); return para; } -ME_DisplayItem* ME_GetOuterParagraph(ME_DisplayItem *para) +ME_Paragraph* table_outer_para( ME_Paragraph *para ) { - if (para->member.para.nFlags & MEPF_ROWEND) - para = para->member.para.prev_para; - while (para->member.para.pCell) + if (para->nFlags & MEPF_ROWEND) para = para_prev( para ); + while (para->pCell) { - para = ME_GetTableRowStart(para); - if (!para->member.para.pCell) - break; - para = ME_FindItemBack(para->member.para.pCell, diParagraph); + para = table_row_start( para ); + if (!para->pCell) break; + para = &ME_FindItemBack( para->pCell, diParagraph )->member.para; } return para; } @@ -330,7 +324,7 @@ void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nC while (!bTruancateDeletion && next_para->member.para.nFlags & MEPF_ROWSTART) { - next_para = ME_GetTableRowEnd(next_para)->member.para.next_para; + next_para = table_row_end( &next_para->member.para )->next_para; if (next_para->member.para.nCharOfs > nOfs + *nChars) { /* End of deletion is not past the end of the table row. */ @@ -416,8 +410,8 @@ ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, assert(table_row->type == diParagraph); if (!editor->bEmulateVersion10) { /* v4.1 */ ME_DisplayItem *insertedCell, *para, *cell, *prevTableEnd; - cell = ME_FindItemFwd(ME_GetTableRowStart(table_row), diCell); - prevTableEnd = ME_GetTableRowEnd(table_row); + cell = ME_FindItemFwd( para_get_di( table_row_start( &table_row->member.para ) ), diCell ); + prevTableEnd = para_get_di( table_row_end( &table_row->member.para ) ); para = prevTableEnd->member.para.next_para; run = ME_FindItemFwd(para, diRun); editor->pCursors[0].pPara = para; @@ -484,15 +478,14 @@ static void ME_SelectOrInsertNextCell(ME_TextEditor *editor, { cell = cell->member.cell.next_cell; } else { - para = ME_GetTableRowEnd(ME_FindItemFwd(cell, diParagraph)); - para = para->member.para.next_para; + para = table_row_end( &ME_FindItemFwd( cell, diParagraph )->member.para )->next_para; assert(para); if (para->member.para.nFlags & MEPF_ROWSTART) { cell = para->member.para.next_para->member.para.pCell; } else { /* Insert row */ para = para->member.para.prev_para; - para = ME_AppendTableRow(editor, ME_GetTableRowStart(para)); + para = ME_AppendTableRow( editor, para_get_di( table_row_start( &para->member.para ) ) ); /* Put cursor at the start of the new table row */ para = para->member.para.next_para; editor->pCursors[0].pPara = para; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 5ff9623e336..a84f738e925 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -209,7 +209,7 @@ static void ME_BeginRow(ME_WrapContext *wc) width -= cell->prev_cell->member.cell.nRightBoundary; if (!cell->prev_cell) { - int rowIndent = ME_GetTableRowEnd( para_get_di( wc->para ) )->member.para.fmt.dxStartIndent; + int rowIndent = table_row_end( wc->para )->fmt.dxStartIndent; width -= rowIndent; } cell->nWidth = max(ME_twips2pointsX(wc->context, width), 0); @@ -843,8 +843,7 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag else { int dxStartIndent = para->fmt.dxStartIndent; - if (para->pCell) - dxStartIndent += ME_GetTableRowEnd( para_get_di( para ) )->member.para.fmt.dxOffset; + if (para->pCell) dxStartIndent += table_row_end( para )->fmt.dxOffset; wc.nLeftMargin = ME_twips2pointsX( c, dxStartIndent + para->fmt.dxOffset ); wc.nFirstMargin = ME_twips2pointsX( c, dxStartIndent ); @@ -1101,8 +1100,8 @@ void ME_InvalidateParagraphRange(ME_TextEditor *editor, if (start_para) { - start_para = ME_GetOuterParagraph(start_para); - last_para = ME_GetOuterParagraph(last_para); + start_para = para_get_di( table_outer_para( &start_para->member.para ) ); + last_para = para_get_di( table_outer_para( &last_para->member.para ) ); rc.top += start_para->member.para.pt.y - ofs; } else { rc.top += editor->nTotalLength - ofs; diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 94001ee44b2..6f5bb4e1f83 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -400,8 +400,8 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, if (!ME_StreamOutPrint(pStream, "\\trowd")) return FALSE; if (!editor->bEmulateVersion10) { /* v4.1 */ - PARAFORMAT2 *pFmt = &ME_GetTableRowEnd(para)->member.para.fmt; - para = ME_GetTableRowStart(para); + PARAFORMAT2 *pFmt = &table_row_end( &para->member.para )->fmt; + para = para_get_di( table_row_start( &para->member.para ) ); cell = para->member.para.next_para->member.para.pCell; assert(cell); if (pFmt->dxOffset) -- 2.23.0

1 0

[PATCH 4/5] riched20: Don't create a display context in InvalidateParagraphRange().
by Huw Davies 09 Oct '20

09 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/wrap.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 819915d4c09..5ff9623e336 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1093,28 +1093,25 @@ void ME_InvalidateParagraphRange(ME_TextEditor *editor, ME_DisplayItem *start_para, ME_DisplayItem *last_para) { - ME_Context c; RECT rc; int ofs; - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - rc = c.rcView; + rc = editor->rcFormat; ofs = editor->vert_si.nPos; - if (start_para) { + if (start_para) + { start_para = ME_GetOuterParagraph(start_para); last_para = ME_GetOuterParagraph(last_para); - rc.top = c.rcView.top + start_para->member.para.pt.y - ofs; + rc.top += start_para->member.para.pt.y - ofs; } else { - rc.top = c.rcView.top + editor->nTotalLength - ofs; + rc.top += editor->nTotalLength - ofs; } if (editor->nTotalLength < editor->nLastTotalLength) - rc.bottom = c.rcView.top + editor->nLastTotalLength - ofs; + rc.bottom = editor->rcFormat.top + editor->nLastTotalLength - ofs; else - rc.bottom = c.rcView.top + last_para->member.para.pt.y + last_para->member.para.nHeight - ofs; + rc.bottom = editor->rcFormat.top + last_para->member.para.pt.y + last_para->member.para.nHeight - ofs; ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE); - - ME_DestroyContext(&c); } -- 2.23.0

1 0

[PATCH 3/5] riched20: Move the marked paragraph list to a rbtree.
by Huw Davies 09 Oct '20

09 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 1 - dlls/riched20/editstr.h | 5 +-- dlls/riched20/para.c | 73 ++++++----------------------------------- dlls/riched20/wrap.c | 39 +++++++++------------- 4 files changed, 28 insertions(+), 90 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2fb7e3650d4..e7e33c27585 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3062,7 +3062,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->bEmulateVersion10 = bEmulateVersion10; ed->styleFlags = 0; ed->exStyleFlags = 0; - ed->first_marked_para = NULL; ed->total_rows = 0; ITextHost_TxGetPropertyBits(texthost, (TXTBIT_RICHTEXT|TXTBIT_MULTILINE| diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 2c5737f3e93..fd5c9bc3df8 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -47,6 +47,7 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" +#include "wine/rbtree.h" #ifdef __ASM_USE_THISCALL_WRAPPER extern const struct ITextHostVtbl itextHostStdcallVtbl DECLSPEC_HIDDEN; @@ -216,7 +217,7 @@ typedef struct tagME_Paragraph struct para_num para_num; ME_Run *eop_run; /* ptr to the end-of-para run */ struct tagME_DisplayItem *prev_para, *next_para; - struct tagME_DisplayItem *prev_marked, *next_marked; + struct wine_rb_entry marked_entry; } ME_Paragraph; typedef struct tagME_Cell /* v4.1 */ @@ -431,7 +432,6 @@ typedef struct tagME_TextEditor int imeStartIndex; DWORD selofs; /* The size of the selection bar on the left side of control */ ME_SelectionType nSelectionType; - ME_DisplayItem *first_marked_para; /* Track previous notified selection */ CHARRANGE notified_cr; @@ -445,6 +445,7 @@ typedef struct tagME_TextEditor int wheel_remain; struct list style_list; struct list reobj_list; + struct wine_rb_tree marked_paras; } ME_TextEditor; typedef struct tagME_Context diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 9d8693ed411..58dcfc8e712 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -35,7 +35,6 @@ static ME_DisplayItem *make_para(ME_TextEditor *editor) ME_SetDefaultParaFormat(editor, &item->member.para.fmt); item->member.para.nFlags = MEPF_REWRAP; - item->member.para.next_marked = item->member.para.prev_marked = NULL; return item; } @@ -74,74 +73,21 @@ int get_total_width(ME_TextEditor *editor) return total_width; } -void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) +static int para_mark_compare( const void *key, const struct wine_rb_entry *entry ) { - ME_DisplayItem *di = para_get_di( para ); - ME_DisplayItem *head = editor->first_marked_para; + ME_Paragraph *para = WINE_RB_ENTRY_VALUE( entry, ME_Paragraph, marked_entry ); - if (!di->member.para.next_marked && !di->member.para.prev_marked) - { - if (di == head) - editor->first_marked_para = NULL; - } - else if (di->member.para.next_marked && di->member.para.prev_marked) - { - di->member.para.prev_marked->member.para.next_marked = di->member.para.next_marked; - di->member.para.next_marked->member.para.prev_marked = di->member.para.prev_marked; - di->member.para.prev_marked = di->member.para.next_marked = NULL; - } - else if (di->member.para.next_marked) - { - assert(di == editor->first_marked_para); - editor->first_marked_para = di->member.para.next_marked; - di->member.para.next_marked->member.para.prev_marked = NULL; - di->member.para.next_marked = NULL; - } - else - { - di->member.para.prev_marked->member.para.next_marked = NULL; - di->member.para.prev_marked = NULL; - } + return *(int *)key - para->nCharOfs; } -void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) +void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) { - ME_DisplayItem *di = para_get_di( para ); - ME_DisplayItem *iter = editor->first_marked_para; + wine_rb_remove_key( &editor->marked_paras, &para->nCharOfs ); +} - if (!iter) - { - editor->first_marked_para = di; - return; - } - while (iter) - { - if (iter == di) - return; - else if (di->member.para.nCharOfs < iter->member.para.nCharOfs) - { - if (iter == editor->first_marked_para) - editor->first_marked_para = di; - di->member.para.next_marked = iter; - iter->member.para.prev_marked = di; - break; - } - else if (di->member.para.nCharOfs >= iter->member.para.nCharOfs) - { - if (!iter->member.para.next_marked || di->member.para.nCharOfs < iter->member.para.next_marked->member.para.nCharOfs) - { - if (iter->member.para.next_marked) - { - di->member.para.next_marked = iter->member.para.next_marked; - iter->member.para.next_marked->member.para.prev_marked = di; - } - di->member.para.prev_marked = iter; - iter->member.para.next_marked = di; - break; - } - } - iter = iter->member.para.next_marked; - } +void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) +{ + wine_rb_put( &editor->marked_paras, &para->nCharOfs, &para->marked_entry ); } ME_Run *para_first_run( ME_Paragraph *para ) @@ -229,6 +175,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) text->pLast->member.para.nCharOfs = editor->bEmulateVersion10 ? 2 : 1; + wine_rb_init( &editor->marked_paras, para_mark_compare ); para_mark_add( editor, &para->member.para ); ME_DestroyContext(&c); } diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index cb17f2963b0..819915d4c09 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1029,19 +1029,22 @@ static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *rep BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_Paragraph *para, *next; + struct wine_rb_entry *entry, *next_entry; ME_Context c; - int totalWidth = editor->nTotalWidth, diff = 0, prev_width; + int totalWidth = editor->nTotalWidth, prev_width; ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; - if (!editor->first_marked_para) - return FALSE; + if (!editor->marked_paras.root) return FALSE; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - para = &editor->first_marked_para->member.para; - c.pt = para->pt; - while (para_get_di( para ) != editor->pBuffer->pLast) + entry = wine_rb_head( editor->marked_paras.root ); + while (entry) { + para = WINE_RB_ENTRY_VALUE( entry, ME_Paragraph, marked_entry ); + next_entry = wine_rb_next( entry ); + + c.pt = para->pt; prev_width = para->nWidth; ME_WrapTextParagraph( editor, &c, para ); if (prev_width == totalWidth && para->nWidth < totalWidth) @@ -1056,11 +1059,10 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) if (para->next_para) { - diff = c.pt.y - para->next_para->member.para.pt.y; - if (diff) + if (c.pt.y != para->next_para->member.para.pt.y) { next = para; - while (next->next_para && next != &para->next_marked->member.para && + while (next->next_para && &next->marked_entry != next_entry && next != &editor->pBuffer->pLast->member.para) { ME_MarkRepaintEnd(next->next_para, &repaint_start, &repaint_end); @@ -1070,26 +1072,15 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) } } } - if (para->next_marked) - { - ME_Paragraph *tmp = para; - para = &para->next_marked->member.para; - para_mark_remove( editor, tmp ); - } - else - { - para_mark_remove( editor, para ); - para = &editor->pBuffer->pLast->member.para; - } - c.pt.y = para->pt.y; + entry = next_entry; } + wine_rb_clear( &editor->marked_paras, NULL, NULL ); + editor->sizeWindow.cx = c.rcView.right-c.rcView.left; editor->sizeWindow.cy = c.rcView.bottom-c.rcView.top; - editor->nTotalLength = c.pt.y; + editor->nTotalLength = editor->pBuffer->pLast->member.para.pt.y; editor->nTotalWidth = totalWidth; - editor->pBuffer->pLast->member.para.pt.x = 0; - editor->pBuffer->pLast->member.para.pt.y = c.pt.y; ME_DestroyContext(&c); -- 2.23.0

1 0

[PATCH 2/5] riched20: Use ME_Paragraph ptrs to iterate in WrapMarkedParagraphs().
by Huw Davies 09 Oct '20

09 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/wrap.c | 98 +++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 51 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index c0c9c8f07e1..cb17f2963b0 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -913,11 +913,11 @@ static void ME_MarkRepaintEnd(ME_DisplayItem *para, *repaint_end = para; } -static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *repaint_start, ME_DisplayItem *repaint_end) +static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *repaint_start, ME_DisplayItem *repaint_end) { - if (item->member.para.nFlags & MEPF_ROWSTART) + if (para->nFlags & MEPF_ROWSTART) { - ME_DisplayItem *cell = ME_FindItemFwd(item, diCell); + ME_DisplayItem *cell = ME_FindItemFwd( para_get_di( para ), diCell); ME_DisplayItem *endRowPara; int borderWidth = 0; cell->member.cell.pt = c->pt; @@ -942,19 +942,19 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r if (endRowPara->member.para.fmt.dxStartIndent > 0) { int dxStartIndent = endRowPara->member.para.fmt.dxStartIndent; - cell = ME_FindItemFwd(item, diCell); + cell = ME_FindItemFwd( para_get_di( para ), diCell); cell->member.cell.pt.x += ME_twips2pointsX(c, dxStartIndent); c->pt.x = cell->member.cell.pt.x; } } - else if (item->member.para.nFlags & MEPF_ROWEND) + else if (para->nFlags & MEPF_ROWEND) { /* Set all the cells to the height of the largest cell */ ME_DisplayItem *startRowPara; int prevHeight, nHeight, bottomBorder = 0; - ME_DisplayItem *cell = ME_FindItemBack(item, diCell); - item->member.para.nWidth = cell->member.cell.pt.x + cell->member.cell.nWidth; - if (!(item->member.para.next_para->member.para.nFlags & MEPF_ROWSTART)) + ME_DisplayItem *cell = ME_FindItemBack( para_get_di( para ), diCell ); + para->nWidth = cell->member.cell.pt.x + cell->member.cell.nWidth; + if (!(para->next_para->member.para.nFlags & MEPF_ROWSTART)) { /* Last row, the bottom border is added to the height. */ cell = cell->member.cell.prev_cell; @@ -964,12 +964,12 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r cell = cell->member.cell.prev_cell; } bottomBorder = ME_twips2pointsY(c, bottomBorder); - cell = ME_FindItemBack(item, diCell); + cell = ME_FindItemBack( para_get_di( para ), diCell ); } prevHeight = cell->member.cell.nHeight; nHeight = cell->member.cell.prev_cell->member.cell.nHeight + bottomBorder; cell->member.cell.nHeight = nHeight; - item->member.para.nHeight = nHeight; + para->nHeight = nHeight; cell = cell->member.cell.prev_cell; cell->member.cell.nHeight = nHeight; while (cell->member.cell.prev_cell) @@ -986,8 +986,8 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r { /* The height of the cells has grown, so invalidate the bottom of * the cells. */ - ME_MarkRepaintEnd(item, &repaint_start, &repaint_end); - cell = ME_FindItemBack(item, diCell); + ME_MarkRepaintEnd( para_get_di( para ) , &repaint_start, &repaint_end ); + cell = ME_FindItemBack( para_get_di( para ), diCell ); while (cell) { ME_MarkRepaintEnd(ME_FindItemBack(cell, diParagraph), &repaint_start, &repaint_end); @@ -995,12 +995,11 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r } } } - else if (item->member.para.pCell && - item->member.para.pCell != item->member.para.next_para->member.para.pCell) + else if (para->pCell && para->pCell != para->next_para->member.para.pCell) { /* The next paragraph is in the next cell in the table row. */ - ME_Cell *cell = &item->member.para.pCell->member.cell; - cell->nHeight = c->pt.y + item->member.para.nHeight - cell->pt.y; + ME_Cell *cell = &para->pCell->member.cell; + cell->nHeight = c->pt.y + para->nHeight - cell->pt.y; /* Propagate the largest height to the end so that it can be easily * sent back to all the cells at the end of the row. */ @@ -1010,82 +1009,79 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r c->pt.x = cell->pt.x + cell->nWidth; c->pt.y = cell->pt.y; cell->next_cell->member.cell.pt = c->pt; - if (!(item->member.para.next_para->member.para.nFlags & MEPF_ROWEND)) + if (!(para->next_para->member.para.nFlags & MEPF_ROWEND)) c->pt.y += cell->yTextOffset; } else { - if (item->member.para.pCell) + if (para->pCell) { /* Next paragraph in the same cell. */ - c->pt.x = item->member.para.pCell->member.cell.pt.x; + c->pt.x = para->pCell->member.cell.pt.x; } else /* Normal paragraph */ c->pt.x = 0; - c->pt.y += item->member.para.nHeight; + c->pt.y += para->nHeight; } } BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { - ME_DisplayItem *item; + ME_Paragraph *para, *next; ME_Context c; int totalWidth = editor->nTotalWidth, diff = 0, prev_width; ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; - ME_Paragraph *para; if (!editor->first_marked_para) return FALSE; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - item = editor->first_marked_para; - c.pt = item->member.para.pt; - while (item != editor->pBuffer->pLast) + para = &editor->first_marked_para->member.para; + c.pt = para->pt; + while (para_get_di( para ) != editor->pBuffer->pLast) { - assert(item->type == diParagraph); - - prev_width = item->member.para.nWidth; - ME_WrapTextParagraph( editor, &c, &item->member.para ); - if (prev_width == totalWidth && item->member.para.nWidth < totalWidth) + prev_width = para->nWidth; + ME_WrapTextParagraph( editor, &c, para ); + if (prev_width == totalWidth && para->nWidth < totalWidth) totalWidth = get_total_width(editor); else - totalWidth = max(totalWidth, item->member.para.nWidth); + totalWidth = max(totalWidth, para->nWidth); - if (!item->member.para.nCharOfs) - ME_MarkRepaintEnd(item->member.para.prev_para, &repaint_start, &repaint_end); - ME_MarkRepaintEnd(item, &repaint_start, &repaint_end); - adjust_para_y(item, &c, repaint_start, repaint_end); + if (!para->nCharOfs) + ME_MarkRepaintEnd( para->prev_para, &repaint_start, &repaint_end ); + ME_MarkRepaintEnd( para_get_di( para ), &repaint_start, &repaint_end ); + adjust_para_y( para, &c, repaint_start, repaint_end ); - if (item->member.para.next_para) + if (para->next_para) { - diff = c.pt.y - item->member.para.next_para->member.para.pt.y; + diff = c.pt.y - para->next_para->member.para.pt.y; if (diff) { - para = &item->member.para; - while (para->next_para && para != &item->member.para.next_marked->member.para && - para != &editor->pBuffer->pLast->member.para) + next = para; + while (next->next_para && next != &para->next_marked->member.para && + next != &editor->pBuffer->pLast->member.para) { - ME_MarkRepaintEnd(para->next_para, &repaint_start, &repaint_end); - para->next_para->member.para.pt.y = c.pt.y; - adjust_para_y(para->next_para, &c, repaint_start, repaint_end); - para = &para->next_para->member.para; + ME_MarkRepaintEnd(next->next_para, &repaint_start, &repaint_end); + next->next_para->member.para.pt.y = c.pt.y; + adjust_para_y( &next->next_para->member.para, &c, repaint_start, repaint_end ); + next = &next->next_para->member.para; } } } - if (item->member.para.next_marked) + if (para->next_marked) { - ME_DisplayItem *rem = item; - item = item->member.para.next_marked; - para_mark_remove( editor, &rem->member.para ); + ME_Paragraph *tmp = para; + para = &para->next_marked->member.para; + para_mark_remove( editor, tmp ); } else { - para_mark_remove( editor, &item->member.para ); - item = editor->pBuffer->pLast; + para_mark_remove( editor, para ); + para = &editor->pBuffer->pLast->member.para; } - c.pt.y = item->member.para.pt.y; + c.pt.y = para->pt.y; } editor->sizeWindow.cx = c.rcView.right-c.rcView.left; editor->sizeWindow.cy = c.rcView.bottom-c.rcView.top; -- 2.23.0

1 0

[PATCH 1/5] riched20: Pass a ME_Paragraph ptr to the marking functions.
by Huw Davies 09 Oct '20

09 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 6 +++--- dlls/riched20/para.c | 31 ++++++++++++++++--------------- dlls/riched20/run.c | 8 ++++---- dlls/riched20/undo.c | 2 +- dlls/riched20/wrap.c | 4 ++-- 7 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0ed34372e38..89fd9d7326c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -394,7 +394,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, c.nOffset -= nCharsToDelete; - mark_para_rewrap(editor, ME_FindItemBack(c.pRun, diParagraph)); + para_mark_rewrap( editor, &ME_FindItemBack( c.pRun, diParagraph )->member.para ); cursor = c; /* nChars is the number of characters that should be deleted from the diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index abc45920878..2fb7e3650d4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2509,7 +2509,7 @@ static BOOL handle_enter(ME_TextEditor *editor) para = editor->pBuffer->pFirst->member.para.next_para; ME_SetDefaultParaFormat(editor, &para->member.para.fmt); para->member.para.nFlags = 0; - mark_para_rewrap(editor, para); + para_mark_rewrap( editor, &para->member.para ); editor->pCursors[0].pPara = para; editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[1] = editor->pCursors[0]; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 47e822c2d34..e7687272510 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -208,9 +208,9 @@ void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_ void para_num_init( ME_Context *c, ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_num_clear( struct para_num *pn ) DECLSPEC_HIDDEN; int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void mark_para_rewrap(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; -void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; -void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; +void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; +void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; +void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; static inline ME_DisplayItem *para_get_di(ME_Paragraph *para) { diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index fb994506bea..9d8693ed411 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -23,10 +23,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); -void mark_para_rewrap(ME_TextEditor *editor, ME_DisplayItem *para) +void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) { - para->member.para.nFlags |= MEPF_REWRAP; - add_marked_para(editor, para); + para->nFlags |= MEPF_REWRAP; + para_mark_add( editor, para ); } static ME_DisplayItem *make_para(ME_TextEditor *editor) @@ -52,7 +52,7 @@ void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) editor->total_rows -= item->member.para.nRows; ME_DestroyString(item->member.para.text); para_num_clear( &item->member.para.para_num ); - remove_marked_para(editor, item); + para_mark_remove( editor, &item->member.para ); ME_DestroyDisplayItem(item); } @@ -74,11 +74,11 @@ int get_total_width(ME_TextEditor *editor) return total_width; } -void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) +void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) { + ME_DisplayItem *di = para_get_di( para ); ME_DisplayItem *head = editor->first_marked_para; - assert(di->type == diParagraph); if (!di->member.para.next_marked && !di->member.para.prev_marked) { if (di == head) @@ -104,8 +104,9 @@ void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) } } -void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) +void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) { + ME_DisplayItem *di = para_get_di( para ); ME_DisplayItem *iter = editor->first_marked_para; if (!iter) @@ -228,7 +229,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) text->pLast->member.para.nCharOfs = editor->bEmulateVersion10 ? 2 : 1; - add_marked_para(editor, para); + para_mark_add( editor, &para->member.para ); ME_DestroyContext(&c); } @@ -236,7 +237,7 @@ static void ME_MarkForWrapping(ME_TextEditor *editor, ME_DisplayItem *first, con { while(first != last) { - mark_para_rewrap(editor, first); + para_mark_rewrap( editor, &first->member.para ); first = first->member.para.next_para; } } @@ -462,7 +463,7 @@ static void para_num_clear_list( ME_TextEditor *editor, ME_Paragraph *para, cons { do { - mark_para_rewrap( editor, para_get_di( para ) ); + para_mark_rewrap( editor, para ); para_num_clear( &para->para_num ); if (para->next_para->type != diParagraph) break; para = &para->next_para->member.para; @@ -537,7 +538,7 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_Paragraph *para, const PA if (memcmp(&copy, &para->fmt, sizeof(PARAFORMAT2))) { - mark_para_rewrap( editor, para_get_di( para ) ); + para_mark_rewrap( editor, para ); if (((dwMask & PFM_NUMBERING) && (copy.wNumbering != para->fmt.wNumbering)) || ((dwMask & PFM_NUMBERINGSTART) && (copy.wNumberingStart != para->fmt.wNumberingStart)) || ((dwMask & PFM_NUMBERINGSTYLE) && (copy.wNumberingStyle != para->fmt.wNumberingStyle))) @@ -612,7 +613,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, new_para->member.para.nCharOfs = run_para->member.para.nCharOfs + ofs; new_para->member.para.nCharOfs += eol_len; new_para->member.para.nFlags = 0; - mark_para_rewrap(editor, new_para); + para_mark_rewrap( editor, &new_para->member.para ); /* FIXME initialize format style and call ME_SetParaFormat blah blah */ new_para->member.para.fmt = run_para->member.para.fmt; @@ -679,9 +680,9 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, /* force rewrap of the */ if (run_para->member.para.prev_para->type == diParagraph) - mark_para_rewrap(editor, run_para->member.para.prev_para); + para_mark_rewrap( editor, &run_para->member.para.prev_para->member.para ); - mark_para_rewrap(editor, new_para->member.para.prev_para); + para_mark_rewrap( editor, &new_para->member.para.prev_para->member.para ); /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */ ME_PropagateCharOffset(next_para, eol_len); @@ -816,7 +817,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, ME_CheckCharOffsets(editor); editor->nParagraphs--; - mark_para_rewrap(editor, tp); + para_mark_rewrap( editor, &tp->member.para ); return tp; } diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index f98288a94a2..c3bc7f50b39 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -247,7 +247,7 @@ void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) int i; assert(p->type == diRun && pNext->type == diRun); assert(p->member.run.nCharOfs != -1); - mark_para_rewrap(editor, ME_GetParagraph(p)); + para_mark_rewrap( editor, &ME_GetParagraph( p )->member.para ); /* Update all cursors so that they don't contain the soon deleted run */ for (i=0; i<editor->nCursors; i++) { @@ -299,7 +299,7 @@ ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) editor->pCursors[i].nOffset -= nOffset; } } - mark_para_rewrap(editor, cursor->pPara); + para_mark_rewrap( editor, &cursor->pPara->member.para ); return run; } @@ -367,7 +367,7 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, ME_InsertBefore( insert_before, pDI ); TRACE("Shift length:%d\n", len); ME_PropagateCharOffset( insert_before, len ); - mark_para_rewrap( editor, para_get_di( insert_before->member.run.para ) ); + para_mark_rewrap( editor, insert_before->member.run.para ); /* Move any cursors that were at the end of the previous run to the end of the inserted run */ prev = ME_FindItemBack( pDI, diRun ); @@ -787,7 +787,7 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C ME_ReleaseStyle(para->para_num.style); para->para_num.style = NULL; } - mark_para_rewrap( editor, para_get_di( para ) ); + para_mark_rewrap( editor, para ); } } diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 2f18fc78bb3..c6b898b2ddc 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -341,7 +341,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) add_undo_set_para_fmt( editor, &para->member.para ); para->member.para.fmt = undo->u.set_para_fmt.fmt; para->member.para.border = undo->u.set_para_fmt.border; - mark_para_rewrap(editor, para); + para_mark_rewrap( editor, &para->member.para ); break; } case undo_set_char_fmt: diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 4853eefcabb..c0c9c8f07e1 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1078,11 +1078,11 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_DisplayItem *rem = item; item = item->member.para.next_marked; - remove_marked_para(editor, rem); + para_mark_remove( editor, &rem->member.para ); } else { - remove_marked_para(editor, item); + para_mark_remove( editor, &item->member.para ); item = editor->pBuffer->pLast; } c.pt.y = item->member.para.pt.y; -- 2.23.0

1 0

[PATCH 1/2] ntoskrnl.exe: Stub PsGetProcessDebugPort.
by Myah Caron 09 Oct '20

09 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 9 +++++++++ include/ddk/wdm.h | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e94feabc826..177816a2239 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2399,6 +2399,15 @@ HANDLE WINAPI PsGetThreadProcessId( PETHREAD thread ) return thread->kthread.id.UniqueProcess; } +/********************************************************************* + * PsGetProcessDebugPort (NTOSKRNL.@) + */ +PVOID WINAPI PsGetProcessDebugPort(PEPROCESS process) +{ + FIXME( "stub: %p\n", process ); + return NULL; +} + /*********************************************************************** * KeInsertQueue (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8892fde5054..8ca0f652f1d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -896,7 +896,7 @@ @ stub PsGetJobSessionId @ stub PsGetJobUIRestrictionsClass @ stub PsGetProcessCreateTimeQuadPart -@ stub PsGetProcessDebugPort +@ stdcall PsGetProcessDebugPort(ptr) @ stub PsGetProcessExitProcessCalled @ stub PsGetProcessExitStatus @ stub PsGetProcessExitTime diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index dfc742eec3b..e712ecf2f84 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2103,6 +2103,14 @@ static void test_permanence(void) ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); } +static void test_debug(void) +{ + PVOID debug_port; + + debug_port = PsGetProcessDebugPort( PsGetCurrentProcess() ); + ok(!debug_port, "got %p\n", debug_port); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -2160,6 +2168,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_dpc(); test_process_memory(test_input); test_permanence(); + test_debug(); if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 6885de1cf89..40f1d9754c0 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1834,6 +1834,7 @@ HANDLE WINAPI PsGetCurrentProcessId(void); HANDLE WINAPI PsGetCurrentThreadId(void); HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); +PVOID WINAPI PsGetProcessDebugPort(PEPROCESS process); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); #if defined(__x86_64__) || defined(__i386__) -- 2.28.0

2 1

[PATCH 2/2] msado15: Implement _Command get/putref ActiveConnection
by Alistair Leslie-Hughes 09 Oct '20

09 Oct '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/command.c | 20 ++++++++++++++++---- dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index eb7b3a035eb..d19108a1a25 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -35,6 +35,7 @@ struct command LONG ref; CommandTypeEnum type; BSTR text; + _Connection *connection; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -80,6 +81,7 @@ static ULONG WINAPI command_Release( _Command *iface ) if (!ref) { TRACE( "destroying %p\n", command ); + if (command->connection) _Connection_Release(command->connection); heap_free( command->text ); heap_free( command ); } @@ -121,14 +123,23 @@ static HRESULT WINAPI command_get_Properties( _Command *iface, Properties **prop static HRESULT WINAPI command_get_ActiveConnection( _Command *iface, _Connection **connection ) { - FIXME( "%p, %p\n", iface, connection ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %p\n", iface, connection ); + + *connection = command->connection; + if (command->connection) _Connection_AddRef(command->connection); + return S_OK; } static HRESULT WINAPI command_putref_ActiveConnection( _Command *iface, _Connection *connection ) { - FIXME( "%p, %p\n", iface, connection ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %p\n", iface, connection ); + + if (command->connection) _Connection_Release(command->connection); + command->connection = connection; + if (command->connection) _Connection_AddRef(command->connection); + return S_OK; } static HRESULT WINAPI command_put_ActiveConnection( _Command *iface, VARIANT connection ) @@ -343,6 +354,7 @@ HRESULT Command_create( void **obj ) command->Command_iface.lpVtbl = &command_vtbl; command->type = adCmdUnknown; command->text = NULL; + command->connection = NULL; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index efcee58c561..378c2eb918c 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -850,6 +850,7 @@ static void test_Command(void) Command25 *command25; CommandTypeEnum cmd_type = adCmdUnspecified; BSTR cmd_text = (BSTR)"test"; + _Connection *connection; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -903,6 +904,14 @@ static void test_Command(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !wcscmp( L"test", cmd_text ), "got %p\n", wine_dbgstr_w( cmd_text ) ); + connection = (_Connection*)0xdeadbeef; + hr = _Command_get_ActiveConnection( command, &connection ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( connection == NULL, "got %p\n", connection ); + + hr = _Command_putref_ActiveConnection( command, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + _Command_Release( command ); } -- 2.28.0

2 1

[PATCH 1/2] msado15: Implement _Connection get/put CursorLocation
by Alistair Leslie-Hughes 09 Oct '20

09 Oct '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 18 ++++++++++++++---- dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 357834a95fe..2773850236d 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -55,6 +55,7 @@ struct connection WCHAR *datasource; WCHAR *provider; ConnectModeEnum mode; + CursorLocationEnum location; struct connection_point cp_connev; }; @@ -325,14 +326,22 @@ static HRESULT WINAPI connection_put_Attributes( _Connection *iface, LONG attr ) static HRESULT WINAPI connection_get_CursorLocation( _Connection *iface, CursorLocationEnum *cursor_loc ) { - FIXME( "%p, %p\n", iface, cursor_loc ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %p\n", iface, cursor_loc ); + + *cursor_loc = connection->location; + return S_OK; } static HRESULT WINAPI connection_put_CursorLocation( _Connection *iface, CursorLocationEnum cursor_loc ) { - FIXME( "%p, %u\n", iface, cursor_loc ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %u\n", iface, cursor_loc ); + + connection->location = cursor_loc; + return S_OK; } static HRESULT WINAPI connection_get_Mode( _Connection *iface, ConnectModeEnum *mode ) @@ -674,6 +683,7 @@ HRESULT Connection_create( void **obj ) connection->datasource = NULL; connection->provider = SysAllocString(L"MSDASQL"); connection->mode = adModeUnknown; + connection->location = adUseServer; connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 8e8553c3b8d..efcee58c561 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -676,6 +676,7 @@ static void test_Connection(void) LONG state, timeout; BSTR str, str2, str3; ConnectModeEnum mode; + CursorLocationEnum location; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -719,6 +720,22 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + location = 0; + hr = _Connection_get_CursorLocation(connection, &location); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(location == adUseServer, "Unexpected location value %d\n", location); + + hr = _Connection_put_CursorLocation(connection, adUseClient); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + + location = 0; + hr = _Connection_get_CursorLocation(connection, &location); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(location == adUseClient, "Unexpected location value %d\n", location); + + hr = _Connection_put_CursorLocation(connection, adUseServer); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + mode = 0xdeadbeef; hr = _Connection_get_Mode(connection, &mode); ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); -- 2.28.0

2 1

[PATCH 1/5] mf/evr: Implement GetMediaTypeCount().
by Nikolay Sivov 09 Oct '20

09 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 9 +++++++-- dlls/mf/tests/mf.c | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index ac3f17fa585..7567b1a7098 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -372,9 +372,14 @@ static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaType static HRESULT WINAPI video_stream_typehandler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) { - FIXME("%p, %p.\n", iface, count); + TRACE("%p, %p.\n", iface, count); - return E_NOTIMPL; + if (!count) + return E_POINTER; + + *count = 0; + + return S_OK; } static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a63c353a4b5..db442453d6d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3296,6 +3296,15 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected type %s.\n", wine_dbgstr_guid(&guid)); + /* Supported types are not advertised. */ + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + count = 1; + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %u.\n", count); + IMFMediaTypeHandler_Release(type_handler); /* Stream uses an allocator. */ -- 2.28.0

1 4

[PATCH 5/5] dssenh: Implement CPImportKey and CPDestroyKey.
by Hans Leidekker 09 Oct '20

09 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 144 ++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 10 +-- 2 files changed, 147 insertions(+), 7 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index a3a4e1b2c37..f02e04585ac 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -317,13 +317,153 @@ BOOL WINAPI CPGenKey( HCRYPTPROV hprov, ALG_ID algid, DWORD flags, HCRYPTKEY *re BOOL WINAPI CPDestroyKey( HCRYPTPROV hprov, HCRYPTKEY hkey ) { - return FALSE; + struct key *key = (struct key *)hkey; + + TRACE( "%p, %p\n", (void *)hprov, (void *)hkey ); + + if (key->magic != MAGIC_KEY) + { + SetLastError( NTE_BAD_KEY ); + return FALSE; + } + + destroy_key( key ); + return TRUE; +} + +static BOOL store_key_pair( struct key *key, HKEY hkey, DWORD keyspec, DWORD flags ) +{ + const WCHAR *value; + DATA_BLOB blob_in, blob_out; + DWORD len; + BYTE *data; + BOOL ret = TRUE; + + if (!key) return TRUE; + if (!(value = map_keyspec_to_keypair_name( keyspec ))) return FALSE; + + if (BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, NULL, 0, &len, 0 )) return FALSE; + if (!(data = heap_alloc( len ))) return FALSE; + + if (!BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, data, len, &len, 0 )) + { + blob_in.pbData = data; + blob_in.cbData = len; + if ((ret = CryptProtectData( &blob_in, NULL, NULL, NULL, NULL, flags, &blob_out ))) + { + ret = !RegSetValueExW( hkey, value, 0, REG_BINARY, blob_out.pbData, blob_out.cbData ); + LocalFree( blob_out.pbData ); + } + } + + heap_free( data ); + return ret; +} + +static BOOL store_key_container_keys( struct container *container ) +{ + HKEY hkey; + DWORD flags; + BOOL ret; + + if (container->flags & CRYPT_MACHINE_KEYSET) + flags = CRYPTPROTECT_LOCAL_MACHINE; + else + flags = 0; + + if (!create_container_regkey( container, KEY_WRITE, &hkey )) return FALSE; + + ret = store_key_pair( container->exch_key, hkey, AT_KEYEXCHANGE, flags ); + if (ret) store_key_pair( container->sign_key, hkey, AT_SIGNATURE, flags ); + RegCloseKey( hkey ); + return ret; } +#define MAGIC_DSS1 ('D' | ('S' << 8) | ('S' << 16) | ('1' << 24)) +#define MAGIC_DSS2 ('D' | ('S' << 8) | ('S' << 16) | ('2' << 24)) + BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKEY hpubkey, DWORD flags, HCRYPTKEY *ret_key ) { - return FALSE; + struct container *container = (struct container *)hprov; + struct key *key; + BLOBHEADER *hdr; + DSSPUBKEY *pubkey; + const WCHAR *type; + NTSTATUS status; + + TRACE( "%p, %p, %u, %p, %08x, %p\n", (void *)hprov, data, len, (void *)hpubkey, flags, ret_key ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + if (len < sizeof(*hdr)) return FALSE; + + hdr = (BLOBHEADER *)data; + if ((hdr->bType != PRIVATEKEYBLOB && hdr->bType != PUBLICKEYBLOB) || hdr->bVersion != 2 || + hdr->aiKeyAlg != CALG_DSS_SIGN) + { + FIXME( "bType %u\n", hdr->bType ); + FIXME( "bVersion %u\n", hdr->bVersion ); + FIXME( "reserved %u\n", hdr->reserved ); + FIXME( "aiKeyAlg %08x\n", hdr->aiKeyAlg ); + return FALSE; + } + + if (len < sizeof(*hdr) + sizeof(*pubkey)) return FALSE; + pubkey = (DSSPUBKEY *)(hdr + 1); + + switch (pubkey->magic) + { + case MAGIC_DSS1: + type = LEGACY_DSA_V2_PUBLIC_BLOB; + break; + + case MAGIC_DSS2: + type = LEGACY_DSA_V2_PRIVATE_BLOB; + break; + + default: + FIXME( "unsupported key magic %08x\n", pubkey->magic ); + return FALSE; + } + + if (!(key = create_key( hdr->aiKeyAlg, flags ))) return FALSE; + + if ((status = BCryptImportKeyPair( key->alg_handle, NULL, type, &key->handle, (UCHAR *)data, len, 0 ))) + { + TRACE( "failed to import key %08x\n", status ); + destroy_key( key ); + return FALSE; + } + + if (!wcscmp(type, LEGACY_DSA_V2_PRIVATE_BLOB)) + { + switch (hdr->aiKeyAlg) + { + case AT_KEYEXCHANGE: + case CALG_DH_SF: + container->exch_key = key; + break; + + case AT_SIGNATURE: + case CALG_DSS_SIGN: + container->sign_key = key; + break; + + default: + FIXME( "unhandled key algorithm %u\n", hdr->aiKeyAlg ); + destroy_key( key ); + return FALSE; + } + + if (!store_key_container_keys( container )) + { + destroy_key( key ); + return FALSE; + } + } + + *ret_key = (HCRYPTKEY)key; + return TRUE; } BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DWORD blobtype, DWORD flags, diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 3bd546524f0..d4a231562e9 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -853,11 +853,6 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Get a private key of array specified ALG_ID */ result = CryptImportKey(hProv, tests[i].privateKey, tests[i].keyLen, 0, 0, &privKey); - if (!result) - { - skip("skipping sign tests\n"); - return; - } ok(result, "Failed to imported key, got %x\n", GetLastError()); /* Create hash object and add data for signature 1 */ @@ -895,6 +890,11 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Sign hash 1 */ result = CryptSignHashA(hHash1, AT_SIGNATURE, NULL, 0, NULL, &signLen1); + if (!result) + { + skip("skipping sign tests\n"); + return; + } ok(result, "Failed to get signature length, got %x\n", GetLastError()); ok(signLen1 == 40, "Expected a 40-byte signature, got %d\n", signLen1); -- 2.28.0

1 0

[PATCH 4/5] dssenh: Implement CPGetHashParam.
by Hans Leidekker 09 Oct '20

09 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 40 +++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 5 ----- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 44912ed4989..a3a4e1b2c37 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -431,7 +431,45 @@ BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DW BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYTE *data, DWORD *len, DWORD flags ) { - return FALSE; + struct hash *hash = (struct hash *)hhash; + + TRACE( "%p, %p, %08x, %p, %p, %08x\n", (void *)hprov, (void *)hhash, param, data, len, flags ); + + if (hash->magic != MAGIC_HASH) return FALSE; + + switch (param) + { + case HP_HASHSIZE: + if (sizeof(hash->len) > *len) + { + *len = sizeof(hash->len); + SetLastError( ERROR_MORE_DATA ); + return FALSE; + } + *(DWORD *)data = hash->len; + *len = sizeof(hash->len); + return TRUE; + + case HP_HASHVAL: + if (!hash->finished) + { + if (BCryptFinishHash( hash->handle, hash->value, hash->len, 0 )) return FALSE; + hash->finished = TRUE; + } + if (hash->len > *len) + { + *len = hash->len; + SetLastError( ERROR_MORE_DATA ); + return FALSE; + } + memcpy( data, hash->value, hash->len ); + *len = hash->len; + return TRUE; + + default: + SetLastError( NTE_BAD_TYPE ); + return FALSE; + } } BOOL WINAPI CPDeriveKey( HCRYPTPROV hprov, ALG_ID algid, HCRYPTHASH hhash, DWORD flags, HCRYPTKEY *ret_key ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index cc4650b2c83..3bd546524f0 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -453,11 +453,6 @@ static void test_hash(const struct hash_test *tests, int testLen) dataLen = sizeof(DWORD); result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&hashLen, &dataLen, 0); - if (!result) - { - skip("skipping hash tests\n"); - return; - } ok(result && (hashLen == tests[i].hashLen), "Expected %d hash len, got %d.Error: %x\n", tests[i].hashLen, hashLen, GetLastError()); -- 2.28.0

1 0

[PATCH 3/5] dssenh: Implement CPHashData.
by Hans Leidekker 09 Oct '20

09 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 10 +++++++++- dlls/dssenh/tests/dssenh.c | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 66f3456d789..44912ed4989 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -1,5 +1,6 @@ /* * Copyright 2008 Maarten Lankhorst + * Copyright 2020 Hans Leidekker for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -418,7 +419,14 @@ BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) { - return FALSE; + struct hash *hash = (struct hash *)hhash; + + TRACE("%p, %p, %p, %u, %08x\n", (void *)hprov, (void *)hhash, data, len, flags ); + + if (hash->magic != MAGIC_HASH) return FALSE; + + if (hash->finished || BCryptHashData( hash->handle, (UCHAR *)data, len, 0 )) return FALSE; + return TRUE; } BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYTE *data, DWORD *len, DWORD flags ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index f06cdd1433a..cc4650b2c83 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -449,15 +449,15 @@ static void test_hash(const struct hash_test *tests, int testLen) ok(result, "Expected creation of a hash.\n"); result = CryptHashData(hHash, data, dataLen, 0); + ok(result, "Expected data to be added to hash.\n"); + + dataLen = sizeof(DWORD); + result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&hashLen, &dataLen, 0); if (!result) { skip("skipping hash tests\n"); return; } - ok(result, "Expected data to be added to hash.\n"); - - dataLen = sizeof(DWORD); - result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&hashLen, &dataLen, 0); ok(result && (hashLen == tests[i].hashLen), "Expected %d hash len, got %d.Error: %x\n", tests[i].hashLen, hashLen, GetLastError()); @@ -608,15 +608,15 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); + ok(result, "Expected data to be added to hash for key derivation.\n"); + + /* Derive key */ + result = CryptDeriveKey(hProv, tests[i].algid, hHash, tests[i].keyLength, &pKey); if (!result) { skip("skipping encryption tests\n"); return; } - ok(result, "Expected data to be added to hash for key derivation.\n"); - - /* Derive key */ - result = CryptDeriveKey(hProv, tests[i].algid, hHash, tests[i].keyLength, &pKey); ok(result, "Expected a derived key.\n"); result = CryptDestroyHash(hHash); @@ -698,15 +698,15 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); + ok(result, "Expected data to be added to hash for key derivation.\n"); + + /* Derive a CALG_RC2 key, but could be any other encryption cipher */ + result = CryptDeriveKey(hProv, CALG_RC2, hHash, 40 << 16, &pKey); if (!result) { skip("skipping ciper modes tests\n"); return; } - ok(result, "Expected data to be added to hash for key derivation.\n"); - - /* Derive a CALG_RC2 key, but could be any other encryption cipher */ - result = CryptDeriveKey(hProv, CALG_RC2, hHash, 40 << 16, &pKey); ok(result, "Expected a derived key.\n"); result = CryptDestroyHash(hHash); -- 2.28.0

1 0

[PATCH 2/5] dssenh: Implement CPCreateHash and CPDestroyHash.
by Hans Leidekker 09 Oct '20

09 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 90 +++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 18 ++++---- 2 files changed, 97 insertions(+), 11 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 32c31a48a8d..66f3456d789 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -54,6 +54,17 @@ struct container char name[MAX_PATH]; }; +#define MAGIC_HASH (('H' << 24) | ('A' << 16) | ('S' << 8) | 'H') +struct hash +{ + DWORD magic; + BCRYPT_ALG_HANDLE alg_handle; + BCRYPT_HASH_HANDLE handle; + DWORD len; + UCHAR value[64]; + BOOL finished; +}; + static const char dss_path_fmt[] = "Software\\Wine\\Crypto\\DSS\\%s"; static BOOL create_container_regkey( struct container *container, REGSAM sam, HKEY *hkey ) @@ -320,14 +331,89 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW return FALSE; } +static struct hash *create_hash( ALG_ID algid ) +{ + struct hash *ret; + const WCHAR *alg; + DWORD len; + + switch (algid) + { + case CALG_MD5: + alg = BCRYPT_MD5_ALGORITHM; + len = 16; + break; + + case CALG_SHA1: + alg = BCRYPT_SHA1_ALGORITHM; + len = 20; + break; + + default: + FIXME( "unhandled algorithm %u\n", algid ); + return 0; + } + + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return 0; + + ret->magic = MAGIC_HASH; + ret->len = len; + if (BCryptOpenAlgorithmProvider( &ret->alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) + { + heap_free( ret ); + return 0; + } + if (BCryptCreateHash( ret->alg_handle, &ret->handle, NULL, 0, NULL, 0, 0 )) + { + BCryptCloseAlgorithmProvider( ret->alg_handle, 0 ); + heap_free( ret ); + return 0; + } + return ret; +} + BOOL WINAPI CPCreateHash( HCRYPTPROV hprov, ALG_ID algid, HCRYPTKEY hkey, DWORD flags, HCRYPTHASH *ret_hash ) { - return FALSE; + struct hash *hash; + + TRACE( "%p, %08x, %p, %08x, %p\n", (void *)hprov, algid, (void *)hkey, flags, ret_hash ); + + switch (algid) + { + case CALG_MD5: + case CALG_SHA1: + break; + + default: + FIXME( "algorithm %u not supported\n", algid ); + SetLastError( NTE_BAD_ALGID ); + return FALSE; + } + + if (!(hash = create_hash( algid ))) return FALSE; + + *ret_hash = (HCRYPTHASH)hash; + return TRUE; } BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) { - return FALSE; + struct hash *hash = (struct hash *)hhash; + + TRACE( "%p, %p\n", (void *)hprov, (void *)hhash); + + if (hash->magic != MAGIC_HASH) + { + SetLastError( NTE_BAD_HASH ); + return FALSE; + } + + BCryptDestroyHash( hash->handle ); + BCryptCloseAlgorithmProvider( hash->alg_handle, 0 ); + + hash->magic = 0; + heap_free( hash ); + return TRUE; } BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index d549b985d6f..f06cdd1433a 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -446,14 +446,14 @@ static void test_hash(const struct hash_test *tests, int testLen) /* test algid hash */ result = CryptCreateHash(hProv, tests[i].algid, 0, 0, &hHash); + ok(result, "Expected creation of a hash.\n"); + + result = CryptHashData(hHash, data, dataLen, 0); if (!result) { skip("skipping hash tests\n"); return; } - ok(result, "Expected creation of a hash.\n"); - - result = CryptHashData(hHash, data, dataLen, 0); ok(result, "Expected data to be added to hash.\n"); dataLen = sizeof(DWORD); @@ -605,14 +605,14 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + ok(result, "Expected creation of a MD5 hash for key derivation.\n"); + + result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); if (!result) { skip("skipping encryption tests\n"); return; } - ok(result, "Expected creation of a MD5 hash for key derivation.\n"); - - result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); ok(result, "Expected data to be added to hash for key derivation.\n"); /* Derive key */ @@ -695,14 +695,14 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + ok(result, "Expected creation of a MD5 hash for key derivation.\n"); + + result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); if (!result) { skip("skipping ciper modes tests\n"); return; } - ok(result, "Expected creation of a MD5 hash for key derivation.\n"); - - result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); ok(result, "Expected data to be added to hash for key derivation.\n"); /* Derive a CALG_RC2 key, but could be any other encryption cipher */ -- 2.28.0

1 0

[PATCH 1/5] dssenh: Implement CPAcquireContext and CPReleaseContext.
by Hans Leidekker 09 Oct '20

09 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/Makefile.in | 1 + dlls/dssenh/main.c | 256 ++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 42 ++++++ 3 files changed, 297 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in index 8015768f99b..67b0d6a141c 100644 --- a/dlls/dssenh/Makefile.in +++ b/dlls/dssenh/Makefile.in @@ -1,4 +1,5 @@ MODULE = dssenh.dll +IMPORTS = bcrypt crypt32 advapi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 5aa885c8b86..32c31a48a8d 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -22,23 +22,275 @@ #include "windef.h" #include "winbase.h" #include "wincrypt.h" +#include "winreg.h" +#include "bcrypt.h" #include "objbase.h" #include "rpcproxy.h" #include "wine/debug.h" +#include "wine/heap.h" static HINSTANCE instance; WINE_DEFAULT_DEBUG_CHANNEL(dssenh); +#define MAGIC_KEY (('K' << 24) | ('E' << 16) | ('Y' << 8) | '0') +struct key +{ + DWORD magic; + DWORD algid; + DWORD flags; + BCRYPT_ALG_HANDLE alg_handle; + BCRYPT_KEY_HANDLE handle; +}; + +#define MAGIC_CONTAINER (('C' << 24) | ('O' << 16) | ('N' << 8) | 'T') +struct container +{ + DWORD magic; + DWORD flags; + struct key *exch_key; + struct key *sign_key; + char name[MAX_PATH]; +}; + +static const char dss_path_fmt[] = "Software\\Wine\\Crypto\\DSS\\%s"; + +static BOOL create_container_regkey( struct container *container, REGSAM sam, HKEY *hkey ) +{ + char path[sizeof(dss_path_fmt) + MAX_PATH]; + HKEY rootkey; + + sprintf( path, dss_path_fmt, container->name ); + + if (container->flags & CRYPT_MACHINE_KEYSET) + rootkey = HKEY_LOCAL_MACHINE; + else + rootkey = HKEY_CURRENT_USER; + + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\DSS */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\DSS */ + return !RegCreateKeyExA( rootkey, path, 0, NULL, REG_OPTION_NON_VOLATILE, sam, NULL, hkey, NULL ); +} + +static struct container *create_key_container( const char *name, DWORD flags ) +{ + struct container *ret; + + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; + ret->magic = MAGIC_CONTAINER; + ret->flags = flags; + if (name) strcpy( ret->name, name ); + + if (!(flags & CRYPT_VERIFYCONTEXT)) + { + HKEY hkey; + if (create_container_regkey( ret, KEY_WRITE, &hkey )) RegCloseKey( hkey ); + } + return ret; +} + +static BOOL open_container_regkey( const char *name, DWORD flags, REGSAM access, HKEY *hkey ) +{ + char path[sizeof(dss_path_fmt) + MAX_PATH]; + HKEY rootkey; + + sprintf( path, dss_path_fmt, name ); + + if (flags & CRYPT_MACHINE_KEYSET) + rootkey = HKEY_LOCAL_MACHINE; + else + rootkey = HKEY_CURRENT_USER; + + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\DSS */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\DSS */ + return !RegOpenKeyExA( rootkey, path, 0, access, hkey ); +} + +static const WCHAR *map_keyspec_to_keypair_name( DWORD keyspec ) +{ + const WCHAR *name; + + switch (keyspec) + { + case AT_KEYEXCHANGE: + name = L"KeyExchangeKeyPair"; + break; + case AT_SIGNATURE: + name = L"SignatureKeyPair"; + break; + default: + ERR( "invalid key spec %u\n", keyspec ); + return NULL; + } + return name; +} + +static struct key *create_key( ALG_ID algid, DWORD flags ) +{ + struct key *ret; + const WCHAR *alg; + + switch (algid) + { + case AT_SIGNATURE: + case CALG_DSS_SIGN: + alg = BCRYPT_DSA_ALGORITHM; + break; + + default: + FIXME( "unhandled algorithm %08x\n", algid ); + return NULL; + } + + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; + + ret->magic = MAGIC_KEY; + ret->algid = algid; + ret->flags = flags; + if (BCryptOpenAlgorithmProvider( &ret->alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) + { + heap_free( ret ); + return NULL; + } + return ret; +} + +static void destroy_key( struct key *key ) +{ + if (!key) return; + BCryptDestroyKey( key->handle ); + BCryptCloseAlgorithmProvider( key->alg_handle, 0 ); + key->magic = 0; + heap_free( key ); +} + +static struct key *import_key( DWORD keyspec, BYTE *data, DWORD len ) +{ + struct key *ret; + + if (!(ret = create_key( keyspec, 0 ))) return NULL; + + if (BCryptImportKeyPair( ret->alg_handle, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, &ret->handle, data, len, 0 )) + { + WARN( "failed to import key\n" ); + destroy_key( ret ); + return NULL; + } + return ret; +} + +static struct key *read_key( HKEY hkey, DWORD keyspec, DWORD flags ) +{ + const WCHAR *value; + DWORD type, len; + BYTE *data; + DATA_BLOB blob_in, blob_out; + struct key *ret = NULL; + + if (!(value = map_keyspec_to_keypair_name( keyspec ))) return NULL; + if (RegQueryValueExW( hkey, value, 0, &type, NULL, &len )) return NULL; + if (!(data = heap_alloc( len ))) return NULL; + + if (!RegQueryValueExW( hkey, value, 0, &type, data, &len )) + { + blob_in.pbData = data; + blob_in.cbData = len; + if (CryptUnprotectData( &blob_in, NULL, NULL, NULL, NULL, flags, &blob_out )) + { + ret = import_key( keyspec, blob_out.pbData, blob_out.cbData ); + LocalFree( blob_out.pbData ); + } + } + + heap_free( data ); + return ret; +} + +static void destroy_container( struct container *container ) +{ + if (!container) return; + destroy_key( container->exch_key ); + destroy_key( container->sign_key ); + container->magic = 0; + heap_free( container ); +} + +static struct container *read_key_container( const char *name, DWORD flags ) +{ + DWORD protect_flags = (flags & CRYPT_MACHINE_KEYSET) ? CRYPTPROTECT_LOCAL_MACHINE : 0; + struct container *ret; + HKEY hkey; + + if (!open_container_regkey( name, flags, KEY_READ, &hkey )) return NULL; + + if ((ret = create_key_container( name, flags ))) + { + ret->exch_key = read_key( hkey, AT_KEYEXCHANGE, protect_flags ); + ret->sign_key = read_key( hkey, AT_SIGNATURE, protect_flags ); + } + + RegCloseKey( hkey ); + return ret; +} + BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) { - return FALSE; + struct container *ret; + char name[MAX_PATH]; + + TRACE( "%p, %s, %08x, %p\n", ret_prov, debugstr_a(container), flags, vtable ); + + if (container && *container) + { + if (lstrlenA( container ) >= sizeof(name)) return FALSE; + lstrcpyA( name, container ); + } + else + { + DWORD len = sizeof(name); + if (!GetUserNameA( name, &len )) return FALSE; + } + + switch (flags) + { + case 0: + ret = read_key_container( name, flags ); + break; + + case CRYPT_NEWKEYSET: + if ((ret = read_key_container( name, flags ))) + { + heap_free( ret ); + SetLastError( NTE_EXISTS ); + return FALSE; + } + ret = create_key_container( name, flags ); + break; + + case CRYPT_VERIFYCONTEXT: + ret = create_key_container( "", flags ); + break; + + default: + FIXME( "unsupported flags %08x\n", flags ); + return FALSE; + } + + if (!ret) return FALSE; + *ret_prov = (HCRYPTPROV)ret; + return TRUE; } BOOL WINAPI CPReleaseContext( HCRYPTPROV hprov, DWORD flags ) { - return FALSE; + struct container *container = (struct container *)hprov; + + TRACE( "%p, %08x\n", (void *)hprov, flags ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + destroy_container( container ); + return TRUE; } BOOL WINAPI CPGetProvParam( HCRYPTPROV hprov, DWORD param, BYTE *data, DWORD *len, DWORD flags ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index c88fcd14661..d549b985d6f 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -323,6 +323,7 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t static void test_keylength(void) { HCRYPTPROV hProv = 0; + HCRYPTKEY key; BOOL result; /* acquire base dss provider */ @@ -335,6 +336,17 @@ static void test_keylength(void) } ok(result, "Expected no errors.\n"); + result = CryptGenKey(hProv, AT_SIGNATURE, 0, &key); + todo_wine ok(result, "Expected no errors.\n"); + if (!result) + { + skip("skipping key length tests\n"); + return; + } + + result = CryptDestroyKey(key); + ok(result, "Expected no errors.\n"); + /* perform keylength tests */ test_keylength_array(hProv, baseDSS_keylength, ARRAY_SIZE(baseDSS_keylength)); @@ -434,6 +446,11 @@ static void test_hash(const struct hash_test *tests, int testLen) /* test algid hash */ result = CryptCreateHash(hProv, tests[i].algid, 0, 0, &hHash); + if (!result) + { + skip("skipping hash tests\n"); + return; + } ok(result, "Expected creation of a hash.\n"); result = CryptHashData(hHash, data, dataLen, 0); @@ -588,6 +605,11 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + if (!result) + { + skip("skipping encryption tests\n"); + return; + } ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); @@ -673,6 +695,11 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + if (!result) + { + skip("skipping ciper modes tests\n"); + return; + } ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); @@ -831,6 +858,11 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Get a private key of array specified ALG_ID */ result = CryptImportKey(hProv, tests[i].privateKey, tests[i].keyLen, 0, 0, &privKey); + if (!result) + { + skip("skipping sign tests\n"); + return; + } ok(result, "Failed to imported key, got %x\n", GetLastError()); /* Create hash object and add data for signature 1 */ @@ -1084,6 +1116,11 @@ static void test_keyExchange_baseDSS(HCRYPTPROV hProv, const struct keyExchange_ /* Generate key exchange keys for user1 and user2 */ result = CryptGenKey(hProv, tests[i].algid, 512 << 16 | CRYPT_PREGEN, &privKey1); + if (!result) + { + skip("skipping key exchange tests\n"); + return; + } ok(!result && GetLastError() == NTE_BAD_ALGID, "Expected NTE_BAD_ALGID, got %x\n", GetLastError()); @@ -1233,6 +1270,11 @@ static void test_keyExchange_dssDH(HCRYPTPROV hProv, const struct keyExchange_te /* Generate key exchange keys for user1 and user2 */ result = CryptGenKey(hProv, tests[i].algid, 512 << 16 | CRYPT_PREGEN, &privKey1); + if (!result) + { + skip("skipping key exchange tests\n"); + return; + } ok(result, "Failed to generate a key for user1, got %x\n", GetLastError()); result = CryptGenKey(hProv, tests[i].algid, 512 << 16 | CRYPT_PREGEN, &privKey2); -- 2.28.0

1 0

[PATCH 1/2] comctl32/ipaddress: Fix IPM_CLEARADDRESS return value.
by Nikolay Sivov 09 Oct '20

09 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/ipaddress.c | 7 +++--- dlls/comctl32/tests/ipaddress.c | 43 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 32816561e3d..82d47d4e576 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -354,7 +354,7 @@ static BOOL IPADDRESS_SetRange (IPADDRESS_INFO *infoPtr, int index, WORD range) } -static void IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) +static LRESULT IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) { int i; @@ -362,6 +362,8 @@ static void IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) for (i = 0; i < 4; i++) SetWindowTextW (infoPtr->Part[i].EditHwnd, L""); + + return 1; } @@ -614,8 +616,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; case IPM_CLEARADDRESS: - IPADDRESS_ClearAddress (infoPtr); - break; + return IPADDRESS_ClearAddress (infoPtr); case IPM_SETADDRESS: return IPADDRESS_SetAddress (infoPtr, (DWORD)lParam); diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index c87d0f56641..9bb9dd63d71 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -144,6 +144,47 @@ static void test_WM_SETFOCUS(void) DestroyWindow(hwnd); } +static void test_IPM_CLEARADDRESS(void) +{ + struct child_enum child_enum = { 0 }; + char buff[16]; + int i, ret; + HWND hwnd; + + hwnd = create_ipaddress_control(); + ok(!!hwnd, "Failed to create control.\n"); + + ret = SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(0, 1, 2, 3)); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + EnumChildWindows(hwnd, test_child_enum_proc, (LPARAM)&child_enum); + ok(child_enum.count == 4, "Unexpected child count %u.\n", child_enum.count); + + ret = SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(1, 2, 3, 4)); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = GetWindowTextA(hwnd, buff, ARRAY_SIZE(buff)); + ok(ret == 7, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "1.2.3.4"), "Unexpected address %s.\n", buff); + + ret = SendMessageA(hwnd, IPM_CLEARADDRESS, 0, 0); + ok(ret, "Unexpected return value %d.\n", ret); + + ret = GetWindowTextA(hwnd, buff, ARRAY_SIZE(buff)); + ok(ret == 7, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "0.0.0.0"), "Unexpected address %s.\n", buff); + + for (i = 0; i < 4; ++i) + { + buff[0] = 1; + ret = GetWindowTextA(child_enum.fields[i], buff, ARRAY_SIZE(buff)); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(!*buff, "Unexpected field text %s.\n", buff); + } + + DestroyWindow(hwnd); +} + START_TEST(ipaddress) { ULONG_PTR cookie; @@ -152,6 +193,7 @@ START_TEST(ipaddress) test_get_set_text(); test_IPM_SETFOCUS(); test_WM_SETFOCUS(); + test_IPM_CLEARADDRESS(); if (!load_v6_module(&cookie, &ctxt)) return; @@ -159,6 +201,7 @@ START_TEST(ipaddress) test_get_set_text(); test_IPM_SETFOCUS(); test_WM_SETFOCUS(); + test_IPM_CLEARADDRESS(); unload_v6_module(cookie, ctxt); } -- 2.28.0

1 1

[PATCH 2/2] ntoskrnl.exe: Implement PsIsProcessBeingDebugged.
by Myah Caron 09 Oct '20

09 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Based on ReactOS's implementation (hence the first patch in this series). dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 4 ++++ include/ddk/wdm.h | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 177816a2239..aea80c77fcd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2962,6 +2962,16 @@ BOOLEAN WINAPI PsIsSystemThread(PETHREAD thread) } +/*********************************************************************** + * PsIsProcessBeingDebugged (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI PsIsProcessBeingDebugged(PEPROCESS process) +{ + TRACE( "%p\n", process ); + return !!PsGetProcessDebugPort( process ); +} + + /*********************************************************************** * PsGetVersion (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8ca0f652f1d..6ada30e1f21 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -923,7 +923,7 @@ @ stdcall PsGetVersion(ptr ptr ptr ptr) @ stdcall PsImpersonateClient(ptr ptr long long long) @ extern PsInitialSystemProcess -@ stub PsIsProcessBeingDebugged +@ stdcall PsIsProcessBeingDebugged(ptr) @ stdcall PsIsSystemThread(ptr) @ stub PsIsThreadImpersonating @ stub PsIsThreadTerminating diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index e712ecf2f84..3d76bdf6856 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2106,9 +2106,13 @@ static void test_permanence(void) static void test_debug(void) { PVOID debug_port; + BOOLEAN is_debugged; debug_port = PsGetProcessDebugPort( PsGetCurrentProcess() ); ok(!debug_port, "got %p\n", debug_port); + + is_debugged = PsIsProcessBeingDebugged( PsGetCurrentProcess() ); + ok(!is_debugged, "got %d\n", is_debugged); } static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 40f1d9754c0..8c639b50320 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1835,6 +1835,7 @@ HANDLE WINAPI PsGetCurrentThreadId(void); HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); PVOID WINAPI PsGetProcessDebugPort(PEPROCESS process); +BOOLEAN WINAPI PsIsProcessBeingDebugged(PEPROCESS process); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); #if defined(__x86_64__) || defined(__i386__) -- 2.28.0

1 0

[PATCH 2/2] dxgi: Update swapchain containing output after Alt+Enter was used to exit fullscreen.
by Zhiyi Zhang 09 Oct '20

09 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 194122. Put a struct wined3d_swapchain_state_parent in d3d/dxgi swapchains. struct wined3d_swapchain_state_parent is passed to wined3d_swapchain_create as a parameter and not in struct wined3d_swapchain_desc because puttting it in there will make some swapchain description struct conversion ugly. For example, wined3d_swapchain_desc_from_dxgi() needs to take in account of whether it's a d3d11 or d3d12 swapchain and then set corresponding wined3d_swapchain_state_parent unless we set the field outside of wined3d_swapchain_desc_from_dxgi(), which doesn't seems nice also. dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/swapchain.c | 16 ++++++++-- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/swapchain.c | 16 ++++++++-- dlls/ddraw/ddraw.c | 16 ++++++++-- dlls/ddraw/ddraw_private.h | 1 + dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 57 ++++++++++++++++++++++++++++++++-- dlls/dxgi/tests/dxgi.c | 15 +++++---- dlls/wined3d/adapter_gl.c | 9 +++--- dlls/wined3d/adapter_vk.c | 10 +++--- dlls/wined3d/directx.c | 10 +++--- dlls/wined3d/swapchain.c | 52 ++++++++++++++++++++----------- dlls/wined3d/wined3d.spec | 4 +-- dlls/wined3d/wined3d_private.h | 16 +++++++--- include/wine/wined3d.h | 20 ++++++++++-- 16 files changed, 188 insertions(+), 57 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index e98746a13bd..bb25be16de0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -185,6 +185,7 @@ struct d3d8_swapchain IDirect3DSwapChain8 IDirect3DSwapChain8_iface; LONG refcount; struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_state_parent state_parent; IDirect3DDevice8 *parent_device; unsigned int swap_interval; }; diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index f08a19ca238..78db4fcaf24 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -156,6 +156,17 @@ static const struct wined3d_parent_ops d3d8_swapchain_wined3d_parent_ops = d3d8_swapchain_wined3d_object_released, }; +static void CDECL d3d8_swapchain_windowed_state_changed(struct wined3d_swapchain_state_parent *parent, + BOOL windowed) +{ + TRACE("parent %p, windowed %d.\n", parent, windowed); +} + +static const struct wined3d_swapchain_state_parent_ops d3d8_swapchain_state_parent_ops = +{ + d3d8_swapchain_windowed_state_changed, +}; + static HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_device *device, struct wined3d_swapchain_desc *desc, unsigned int swap_interval) { @@ -163,10 +174,11 @@ static HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_devi swapchain->refcount = 1; swapchain->IDirect3DSwapChain8_iface.lpVtbl = &d3d8_swapchain_vtbl; + swapchain->state_parent.ops = &d3d8_swapchain_state_parent_ops; swapchain->swap_interval = swap_interval; - if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, - &d3d8_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, &swapchain->state_parent, + swapchain, &d3d8_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index e78ce75a2f0..03ab10ad01b 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -162,6 +162,7 @@ struct d3d9_swapchain IDirect3DSwapChain9Ex IDirect3DSwapChain9Ex_iface; LONG refcount; struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_state_parent state_parent; IDirect3DDevice9Ex *parent_device; unsigned int swap_interval; }; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 8d6cff982d3..0955b672c79 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -356,6 +356,17 @@ static const struct wined3d_parent_ops d3d9_swapchain_wined3d_parent_ops = d3d9_swapchain_wined3d_object_released, }; +static void CDECL d3d9_swapchain_windowed_state_changed(struct wined3d_swapchain_state_parent *parent, + BOOL windowed) +{ + TRACE("parent %p, windowed %d.\n", parent, windowed); +} + +static const struct wined3d_swapchain_state_parent_ops d3d9_swapchain_state_parent_ops = +{ + d3d9_swapchain_windowed_state_changed, +}; + static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_device *device, struct wined3d_swapchain_desc *desc, unsigned int swap_interval) { @@ -363,10 +374,11 @@ static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_devi swapchain->refcount = 1; swapchain->IDirect3DSwapChain9Ex_iface.lpVtbl = &d3d9_swapchain_vtbl; + swapchain->state_parent.ops = &d3d9_swapchain_state_parent_ops; swapchain->swap_interval = swap_interval; - if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, - &d3d9_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, &swapchain->state_parent, + swapchain, &d3d9_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c3c335d978e..11a16f8d535 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -80,6 +80,17 @@ const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops = ddraw_null_wined3d_object_destroyed, }; +static void CDECL ddraw_swapchain_windowed_state_changed(struct wined3d_swapchain_state_parent *parent, + BOOL windowed) +{ + TRACE("parent %p, windowed %d.\n", parent, windowed); +} + +static const struct wined3d_swapchain_state_parent_ops ddraw_swapchain_state_parent_ops = +{ + ddraw_swapchain_windowed_state_changed, +}; + static inline struct ddraw *impl_from_IDirectDraw(IDirectDraw *iface) { return CONTAINING_RECORD(iface, struct ddraw, IDirectDraw_iface); @@ -577,7 +588,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, if (ddraw->flags & DDRAW_NO3D) return wined3d_swapchain_create(ddraw->wined3d_device, &swapchain_desc, - NULL, &ddraw_null_wined3d_parent_ops, wined3d_swapchain); + &ddraw->state_parent, NULL, &ddraw_null_wined3d_parent_ops, wined3d_swapchain); if (!window || window == GetDesktopWindow()) { @@ -605,7 +616,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, * recursive loop until ram or emulated video memory is full. */ ddraw->flags |= DDRAW_D3D_INITIALIZED; if (FAILED(hr = wined3d_swapchain_create(ddraw->wined3d_device, &swapchain_desc, - NULL, &ddraw_null_wined3d_parent_ops, wined3d_swapchain))) + &ddraw->state_parent, NULL, &ddraw_null_wined3d_parent_ops, wined3d_swapchain))) { ddraw->flags &= ~DDRAW_D3D_INITIALIZED; DestroyWindow(window); @@ -5105,6 +5116,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de ddraw->IDirect3D3_iface.lpVtbl = &d3d3_vtbl; ddraw->IDirect3D7_iface.lpVtbl = &d3d7_vtbl; ddraw->device_parent.ops = &ddraw_wined3d_device_parent_ops; + ddraw->state_parent.ops = &ddraw_swapchain_state_parent_ops; ddraw->numIfaces = 1; ddraw->ref7 = 1; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 776f61e1024..6bbd62949ac 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -105,6 +105,7 @@ struct ddraw struct wined3d_texture *wined3d_frontbuffer; struct wined3d_texture *gdi_surface; struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_state_parent state_parent; HWND swapchain_window; /* DirectDraw things, which are not handled by WineD3D */ diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index e43ee59461c..acba3544e39 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -177,6 +177,7 @@ struct d3d11_swapchain LONG refcount; struct wined3d_private_store private_store; struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_state_parent state_parent; IWineDXGIDevice *device; IDXGIFactory *factory; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 36beb84aa28..0f335a71cb7 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -811,6 +811,30 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = d3d11_swapchain_wined3d_object_released, }; +static inline struct d3d11_swapchain *d3d11_swapchain_from_wined3d_swapchain_state_parent(struct wined3d_swapchain_state_parent *parent) +{ + return CONTAINING_RECORD(parent, struct d3d11_swapchain, state_parent); +} + +static void CDECL d3d11_swapchain_windowed_state_changed(struct wined3d_swapchain_state_parent *parent, + BOOL windowed) +{ + struct d3d11_swapchain *swapchain = d3d11_swapchain_from_wined3d_swapchain_state_parent(parent); + + TRACE("parent %p, windowed %d.\n", parent, windowed); + + if (windowed && swapchain->target) + { + IDXGIOutput_Release(swapchain->target); + swapchain->target = NULL; + } +} + +static const struct wined3d_swapchain_state_parent_ops d3d11_swapchain_state_parent_ops = +{ + d3d11_swapchain_windowed_state_changed, +}; + HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc) { @@ -840,6 +864,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi } swapchain->IDXGISwapChain1_iface.lpVtbl = &d3d11_swapchain_vtbl; + swapchain->state_parent.ops = &d3d11_swapchain_state_parent_ops; swapchain->refcount = 1; wined3d_mutex_lock(); wined3d_private_store_init(&swapchain->private_store); @@ -849,8 +874,8 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi fullscreen = !desc->windowed; desc->windowed = TRUE; - if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, - &d3d11_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, &swapchain->state_parent, + swapchain, &d3d11_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); goto cleanup; @@ -1037,6 +1062,7 @@ struct d3d12_swapchain struct wined3d_private_store private_store; struct wined3d_swapchain_state *state; + struct wined3d_swapchain_state_parent state_parent; VkSwapchainKHR vk_swapchain; VkSurfaceKHR vk_surface; @@ -2938,6 +2964,30 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return TRUE; } +static inline struct d3d12_swapchain *d3d12_swapchain_from_wined3d_swapchain_state_parent(struct wined3d_swapchain_state_parent *parent) +{ + return CONTAINING_RECORD(parent, struct d3d12_swapchain, state_parent); +} + +static void CDECL d3d12_swapchain_windowed_state_changed(struct wined3d_swapchain_state_parent *parent, + BOOL windowed) +{ + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_wined3d_swapchain_state_parent(parent); + + TRACE("parent %p, windowed %d.\n", parent, windowed); + + if (windowed && swapchain->target) + { + IDXGIOutput_Release(swapchain->target); + swapchain->target = NULL; + } +} + +static const struct wined3d_swapchain_state_parent_ops d3d12_swapchain_state_parent_ops = +{ + d3d12_swapchain_windowed_state_changed, +}; + static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGIFactory *factory, ID3D12Device *device, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc) @@ -2967,6 +3017,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI } swapchain->IDXGISwapChain4_iface.lpVtbl = &d3d12_swapchain_vtbl; + swapchain->state_parent.ops = &d3d12_swapchain_state_parent_ops; swapchain->refcount = 1; swapchain->window = window; @@ -3024,7 +3075,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI dxgi_factory = unsafe_impl_from_IDXGIFactory((IDXGIFactory *)factory); if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, dxgi_factory->wined3d, - &swapchain->state))) + &swapchain->state_parent, &swapchain->state))) { IDXGIOutput_Release(output); return hr; diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 2838a025e57..c6ece51f2a8 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2431,7 +2431,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) flush_events(); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(!fullscreen, "Expect swapchain not full screen.\n"); + ok(!fullscreen, "Expect swapchain not full screen.\n"); /* Move the swapchain output window to the second output */ hr = IDXGIOutput_GetDesc(output2, &output_desc2); @@ -2453,7 +2453,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); IDXGIOutput_Release(output); @@ -2465,7 +2465,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); @@ -6148,7 +6148,6 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) UINT flag; BOOL expect_fullscreen; BOOL broken_d3d10; - BOOL todo_on_d3d12; } tests[] = { @@ -6162,15 +6161,15 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) * - Posting them hangs the posting thread. Another thread that keeps * sending input is needed to avoid the hang. The hang is not * because of flush_events(). */ - {0, TRUE, FALSE, TRUE}, + {0, TRUE}, {0, FALSE}, {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, - {DXGI_MWA_NO_ALT_ENTER, FALSE, TRUE}, + {DXGI_MWA_NO_ALT_ENTER}, {DXGI_MWA_NO_ALT_ENTER, FALSE}, - {DXGI_MWA_NO_PRINT_SCREEN, TRUE, FALSE, TRUE}, + {DXGI_MWA_NO_PRINT_SCREEN, TRUE}, {DXGI_MWA_NO_PRINT_SCREEN, FALSE}, - {0, TRUE, FALSE, TRUE}, + {0, TRUE}, {0, FALSE} }; diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 5bf9d179e4d..140948beb6d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4590,19 +4590,20 @@ static void adapter_gl_copy_bo_address(struct wined3d_context *context, wined3d_context_gl_copy_bo_address(wined3d_context_gl(context), dst, src, size); } -static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, +static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { struct wined3d_swapchain_gl *swapchain_gl; HRESULT hr; - TRACE("device %p, desc %p, parent %p, parent_ops %p, swapchain %p.\n", - device, desc, parent, parent_ops, swapchain); + TRACE("device %p, desc %p, state_parent %p, parent %p, parent_ops %p, swapchain %p.\n", + device, desc, state_parent, parent, parent_ops, swapchain); if (!(swapchain_gl = heap_alloc_zero(sizeof(*swapchain_gl)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_swapchain_gl_init(swapchain_gl, device, desc, parent, parent_ops))) + if (FAILED(hr = wined3d_swapchain_gl_init(swapchain_gl, device, desc, state_parent, parent, parent_ops))) { WARN("Failed to initialise swapchain, hr %#x.\n", hr); heap_free(swapchain_gl); diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5c219d45d3e..64850944040 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1103,19 +1103,21 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, adapter_vk_unmap_bo_address(context, src, 0, NULL); } -static HRESULT adapter_vk_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, +static HRESULT adapter_vk_create_swapchain(struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { struct wined3d_swapchain_vk *swapchain_vk; HRESULT hr; - TRACE("device %p, desc %p, parent %p, parent_ops %p, swapchain %p.\n", - device, desc, parent, parent_ops, swapchain); + TRACE("device %p, desc %p, state_parent %p, parent %p, parent_ops %p, swapchain %p.\n", + device, desc, state_parent, parent, parent_ops, swapchain); if (!(swapchain_vk = heap_alloc_zero(sizeof(*swapchain_vk)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_swapchain_vk_init(swapchain_vk, device, desc, parent, parent_ops))) + if (FAILED(hr = wined3d_swapchain_vk_init(swapchain_vk, device, desc, state_parent, parent, + parent_ops))) { WARN("Failed to initialise swapchain, hr %#x.\n", hr); heap_free(swapchain_vk); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0fa05a06be6..108a190bf61 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2665,19 +2665,21 @@ static void adapter_no3d_copy_bo_address(struct wined3d_context *context, memcpy(dst->addr, src->addr, size); } -static HRESULT adapter_no3d_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, +static HRESULT adapter_no3d_create_swapchain(struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { struct wined3d_swapchain *swapchain_no3d; HRESULT hr; - TRACE("device %p, desc %p, parent %p, parent_ops %p, swapchain %p.\n", - device, desc, parent, parent_ops, swapchain); + TRACE("device %p, desc %p, state_parent %p, parent %p, parent_ops %p, swapchain %p.\n", + device, desc, state_parent, parent, parent_ops, swapchain); if (!(swapchain_no3d = heap_alloc_zero(sizeof(*swapchain_no3d)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_swapchain_no3d_init(swapchain_no3d, device, desc, parent, parent_ops))) + if (FAILED(hr = wined3d_swapchain_no3d_init(swapchain_no3d, device, desc, state_parent, parent, + parent_ops))) { WARN("Failed to initialise swapchain, hr %#x.\n", hr); heap_free(swapchain_no3d); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b35fb5af65a..f8214379971 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1288,7 +1288,8 @@ static enum wined3d_format_id adapter_format_from_backbuffer_format(const struct } static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *state, - const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d *wined3d) + const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d *wined3d, + struct wined3d_swapchain_state_parent *parent) { HRESULT hr; @@ -1319,6 +1320,7 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat GetWindowRect(window, &state->original_window_rect); state->device_window = window; + state->parent = parent; if (desc->flags & WINED3D_SWAPCHAIN_REGISTER_STATE) wined3d_swapchain_state_register(state, wined3d); @@ -1327,7 +1329,8 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat } static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, - struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, + void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_swapchain_ops *swapchain_ops) { struct wined3d_resource_desc texture_desc; @@ -1353,7 +1356,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); window = desc->device_window ? desc->device_window : device->create_parms.focus_window; - if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d))) + if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d, state_parent))) { ERR("Failed to initialise swapchain state, hr %#x.\n", hr); goto err; @@ -1568,23 +1571,27 @@ err: } HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, struct wined3d_device *device, - struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, + void *parent, const struct wined3d_parent_ops *parent_ops) { - TRACE("swapchain_no3d %p, device %p, desc %p, parent %p, parent_ops %p.\n", - swapchain_no3d, device, desc, parent, parent_ops); + TRACE("swapchain_no3d %p, device %p, desc %p, state_parent %p, parent %p, parent_ops %p.\n", + swapchain_no3d, device, desc, state_parent, parent, parent_ops); - return wined3d_swapchain_init(swapchain_no3d, device, desc, parent, parent_ops, &swapchain_no3d_ops); + return wined3d_swapchain_init(swapchain_no3d, device, desc, state_parent, parent, parent_ops, + &swapchain_no3d_ops); } HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, - struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, + void *parent, const struct wined3d_parent_ops *parent_ops) { HRESULT hr; - TRACE("swapchain_gl %p, device %p, desc %p, parent %p, parent_ops %p.\n", - swapchain_gl, device, desc, parent, parent_ops); + TRACE("swapchain_gl %p, device %p, desc %p, state_parent %p, parent %p, parent_ops %p.\n", + swapchain_gl, device, desc, state_parent, parent, parent_ops); - if (FAILED(hr = wined3d_swapchain_init(&swapchain_gl->s, device, desc, parent, parent_ops, &swapchain_gl_ops))) + if (FAILED(hr = wined3d_swapchain_init(&swapchain_gl->s, device, desc, state_parent, parent, + parent_ops, &swapchain_gl_ops))) { /* Cleanup any context that may have been created for the swapchain. */ wined3d_cs_destroy_object(device->cs, wined3d_swapchain_gl_destroy_object, swapchain_gl); @@ -1595,14 +1602,16 @@ HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, str } HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain_vk *swapchain_vk, struct wined3d_device *device, - struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, + void *parent, const struct wined3d_parent_ops *parent_ops) { HRESULT hr; TRACE("swapchain_vk %p, device %p, desc %p, parent %p, parent_ops %p.\n", swapchain_vk, device, desc, parent, parent_ops); - if (FAILED(hr = wined3d_swapchain_init(&swapchain_vk->s, device, desc, parent, parent_ops, &swapchain_vk_ops))) + if (FAILED(hr = wined3d_swapchain_init(&swapchain_vk->s, device, desc, state_parent, parent, + parent_ops, &swapchain_vk_ops))) return hr; if (swapchain_vk->s.win_handle == GetDesktopWindow()) @@ -1620,14 +1629,16 @@ HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain_vk *swapchain_vk, str return hr; } -HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) +HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, + void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_swapchain **swapchain) { struct wined3d_swapchain *object; HRESULT hr; if (FAILED(hr = device->adapter->adapter_ops->adapter_create_swapchain(device, - desc, parent, parent_ops, &object))) + desc, state_parent, parent, parent_ops, &object))) return hr; if (desc->flags & WINED3D_SWAPCHAIN_IMPLICIT) @@ -2175,6 +2186,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st { struct wined3d_display_mode actual_mode; struct wined3d_output_desc output_desc; + BOOL windowed = state->desc.windowed; HRESULT hr; TRACE("state %p, swapchain_desc %p, mode %p.\n", state, swapchain_desc, mode); @@ -2263,6 +2275,9 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st state->desc.output = swapchain_desc->output; state->desc.windowed = swapchain_desc->windowed; + if (windowed != state->desc.windowed) + state->parent->ops->windowed_state_changed(state->parent, state->desc.windowed); + return WINED3D_OK; } @@ -2280,7 +2295,8 @@ void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state } HRESULT CDECL wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, - HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state **state) + HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state_parent *state_parent, + struct wined3d_swapchain_state **state) { struct wined3d_swapchain_state *s; HRESULT hr; @@ -2290,7 +2306,7 @@ HRESULT CDECL wined3d_swapchain_state_create(const struct wined3d_swapchain_desc if (!(s = heap_alloc_zero(sizeof(*s)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window, wined3d))) + if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window, wined3d, state_parent))) { heap_free(s); return hr; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 77b22b3c907..e4ff1161bce 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -271,7 +271,7 @@ @ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_i(ptr long long ptr) -@ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) +@ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) @ cdecl wined3d_swapchain_get_back_buffer(ptr long) @ cdecl wined3d_swapchain_get_device(ptr) @@ -289,7 +289,7 @@ @ cdecl wined3d_swapchain_set_palette(ptr ptr) @ cdecl wined3d_swapchain_set_window(ptr ptr) -@ cdecl wined3d_swapchain_state_create(ptr ptr ptr ptr) +@ cdecl wined3d_swapchain_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_is_windowed(ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bbb0a60d7bb..4c2204cd86e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3245,8 +3245,10 @@ struct wined3d_adapter_ops unsigned int range_count, const struct wined3d_range *ranges); void (*adapter_copy_bo_address)(struct wined3d_context *context, const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size); - HRESULT (*adapter_create_swapchain)(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); + HRESULT (*adapter_create_swapchain)(struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, + struct wined3d_swapchain_state_parent *state_parent, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); void (*adapter_destroy_swapchain)(struct wined3d_swapchain *swapchain); HRESULT (*adapter_create_buffer)(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, @@ -5070,6 +5072,7 @@ void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_vie struct wined3d_swapchain_state { struct wined3d_swapchain_desc desc; + struct wined3d_swapchain_state_parent *parent; struct wined3d_display_mode original_mode, d3d_mode; RECT original_window_rect; @@ -5128,7 +5131,8 @@ void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + struct wined3d_swapchain_state_parent *state_parent, void *parent, + const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; struct wined3d_swapchain_gl { @@ -5153,7 +5157,8 @@ HDC wined3d_swapchain_gl_get_backup_dc(struct wined3d_swapchain_gl *swapchain_gl struct wined3d_context_gl *wined3d_swapchain_gl_get_context(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + struct wined3d_swapchain_state_parent *state_parent, void *parent, + const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; struct wined3d_swapchain_vk { @@ -5179,7 +5184,8 @@ static inline struct wined3d_swapchain_vk *wined3d_swapchain_vk(struct wined3d_s void wined3d_swapchain_vk_cleanup(struct wined3d_swapchain_vk *swapchain_vk) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain_vk *swapchain_vk, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + struct wined3d_swapchain_state_parent *state_parent, void *parent, + const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; /***************************************************************************** * Utility function prototypes diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 61ab0e90953..62ea3960118 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2248,6 +2248,17 @@ struct wined3d_device_parent_ops const struct wined3d_resource_desc *desc, DWORD texture_flags, struct wined3d_texture **texture); }; +struct wined3d_swapchain_state_parent +{ + const struct wined3d_swapchain_state_parent_ops *ops; +}; + +struct wined3d_swapchain_state_parent_ops +{ + void (__cdecl *windowed_state_changed)(struct wined3d_swapchain_state_parent *state_parent, + BOOL windowed); +}; + struct wined3d_private_store { struct list content; @@ -2774,8 +2785,10 @@ HRESULT __cdecl wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *st HRESULT __cdecl wined3d_stateblock_set_vs_consts_i(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); -HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); +HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, + void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_swapchain **swapchain); ULONG __cdecl wined3d_swapchain_decref(struct wined3d_swapchain *swapchain); struct wined3d_texture * __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, UINT backbuffer_idx); @@ -2804,7 +2817,8 @@ void __cdecl wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, - HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state **state); + HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state_parent *state_parent, + struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); BOOL __cdecl wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, -- 2.25.1

2 2

[PATCH 1/2] dxgi: Support Alt+Enter for d3d12 swapchains.
by Zhiyi Zhang 09 Oct '20

09 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 194121 and 194123. Make wined3d_swapchain_state_register/unregister private in wined3d. dlls/dxgi/swapchain.c | 32 +++++++++-- dlls/dxgi/tests/dxgi.c | 1 - dlls/dxgi/utils.c | 2 +- dlls/wined3d/swapchain.c | 19 +++---- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 99 +++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 5 +- include/wine/wined3d.h | 4 +- 8 files changed, 95 insertions(+), 69 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f3b74389d29..36beb84aa28 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2272,18 +2272,37 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapCha BOOL *fullscreen, IDXGIOutput **target) { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); + BOOL windowed; + HRESULT hr; TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); - if (fullscreen) + if (fullscreen || target) { wined3d_mutex_lock(); - *fullscreen = !wined3d_swapchain_state_is_windowed(swapchain->state); + windowed = wined3d_swapchain_state_is_windowed(swapchain->state); wined3d_mutex_unlock(); } - if (target && (*target = swapchain->target)) - IDXGIOutput_AddRef(*target); + if (fullscreen) + *fullscreen = !windowed; + + if (target) + { + if (!windowed) + { + if (!swapchain->target && FAILED(hr = IDXGISwapChain4_GetContainingOutput(iface, + &swapchain->target))) + return hr; + + *target = swapchain->target; + IDXGIOutput_AddRef(*target); + } + else + { + *target = NULL; + } + } return S_OK; } @@ -2927,6 +2946,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI struct wined3d_swapchain_desc wined3d_desc; VkWin32SurfaceCreateInfoKHR surface_desc; VkPhysicalDevice vk_physical_device; + struct dxgi_factory *dxgi_factory; VkFenceCreateInfo fence_desc; uint32_t queue_family_index; VkSurfaceKHR vk_surface; @@ -3002,7 +3022,9 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hr; } - if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, &swapchain->state))) + dxgi_factory = unsafe_impl_from_IDXGIFactory((IDXGIFactory *)factory); + if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, dxgi_factory->wined3d, + &swapchain->state))) { IDXGIOutput_Release(output); return hr; diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f747e236f31..2838a025e57 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6272,7 +6272,6 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) output = NULL; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(is_d3d12 && tests[i].todo_on_d3d12) ok(fullscreen == tests[i].expect_fullscreen || broken(tests[i].broken_d3d10 && fullscreen), "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 665413e4c62..af72f83b6b0 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -520,7 +520,7 @@ unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE dxgi_usage) #define DXGI_WINED3D_SWAPCHAIN_FLAGS \ (WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE | WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT \ - | WINED3D_SWAPCHAIN_HOOK | WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE) + | WINED3D_SWAPCHAIN_REGISTER_STATE | WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE) unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d0d93417a18..b35fb5af65a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -34,7 +34,7 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) TRACE("Destroying swapchain %p.\n", swapchain); - wined3d_unhook_swapchain(swapchain); + wined3d_swapchain_state_unregister(&swapchain->state); wined3d_swapchain_set_gamma_ramp(swapchain, 0, &swapchain->orig_gamma); /* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0] @@ -1288,7 +1288,7 @@ static enum wined3d_format_id adapter_format_from_backbuffer_format(const struct } static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *state, - const struct wined3d_swapchain_desc *desc, HWND window) + const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d *wined3d) { HRESULT hr; @@ -1320,6 +1320,9 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat GetWindowRect(window, &state->original_window_rect); state->device_window = window; + if (desc->flags & WINED3D_SWAPCHAIN_REGISTER_STATE) + wined3d_swapchain_state_register(state, wined3d); + return hr; } @@ -1350,7 +1353,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); window = desc->device_window ? desc->device_window : device->create_parms.focus_window; - if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window))) + if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d))) { ERR("Failed to initialise swapchain state, hr %#x.\n", hr); goto err; @@ -1627,9 +1630,6 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct win desc, parent, parent_ops, &object))) return hr; - if (desc->flags & WINED3D_SWAPCHAIN_HOOK) - wined3d_hook_swapchain(object); - if (desc->flags & WINED3D_SWAPCHAIN_IMPLICIT) { wined3d_mutex_lock(); @@ -2275,21 +2275,22 @@ BOOL CDECL wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_st void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state) { + wined3d_swapchain_state_unregister(state); heap_free(state); } HRESULT CDECL wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, - HWND window, struct wined3d_swapchain_state **state) + HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state **state) { struct wined3d_swapchain_state *s; HRESULT hr; - TRACE("desc %p, window %p, state %p.\n", desc, window, state); + TRACE("desc %p, window %p, wined3d %p, state %p.\n", desc, window, wined3d, state); if (!(s = heap_alloc_zero(sizeof(*s)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window))) + if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window, wined3d))) { heap_free(s); return hr; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d11e06d0c34..77b22b3c907 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -289,7 +289,7 @@ @ cdecl wined3d_swapchain_set_palette(ptr ptr) @ cdecl wined3d_swapchain_set_window(ptr ptr) -@ cdecl wined3d_swapchain_state_create(ptr ptr ptr) +@ cdecl wined3d_swapchain_state_create(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_is_windowed(ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index c98aee18bdd..001b7dd1255 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -56,25 +56,26 @@ struct wined3d_window_hook unsigned int count; }; -struct wined3d_hooked_swapchain +struct wined3d_registered_swapchain_state { - struct wined3d_swapchain *swapchain; + struct wined3d_swapchain_state *state; + struct wined3d *wined3d; DWORD thread_id; }; -struct wined3d_hook_table +struct wined3d_swapchain_state_table { struct wined3d_window_hook *hooks; SIZE_T hooks_size; SIZE_T hook_count; - struct wined3d_hooked_swapchain *swapchains; - SIZE_T swapchains_size; - SIZE_T swapchain_count; + struct wined3d_registered_swapchain_state *states; + SIZE_T states_size; + SIZE_T state_count; }; static struct wined3d_wndproc_table wndproc_table; -static struct wined3d_hook_table hook_table; +static struct wined3d_swapchain_state_table swapchain_state_table; static CRITICAL_SECTION wined3d_cs; static CRITICAL_SECTION_DEBUG wined3d_cs_debug = @@ -425,13 +426,13 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) } heap_free(wndproc_table.entries); - heap_free(hook_table.swapchains); - for (i = 0; i < hook_table.hook_count; ++i) + heap_free(swapchain_state_table.states); + for (i = 0; i < swapchain_state_table.hook_count; ++i) { - WARN("Leftover hook table entry %p.\n", &hook_table.hooks[i]); - UnhookWindowsHookEx(hook_table.hooks[i].hook); + WARN("Leftover swapchain state hook %p.\n", &swapchain_state_table.hooks[i]); + UnhookWindowsHookEx(swapchain_state_table.hooks[i].hook); } - heap_free(hook_table.hooks); + heap_free(swapchain_state_table.hooks); heap_free(wined3d_settings.logo); UnregisterClassA(WINED3D_OPENGL_WINDOW_CLASS_NAME, hInstDLL); @@ -573,8 +574,8 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam) { + struct wined3d_registered_swapchain_state *registered_state; struct wined3d_swapchain_desc swapchain_desc; - struct wined3d_swapchain *swapchain; struct wined3d_wndproc *entry; struct wined3d_output *output; MSG *msg = (MSG *)lparam; @@ -586,28 +587,28 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam { wined3d_wndproc_mutex_lock(); - for (i = 0; i < hook_table.swapchain_count; ++i) + for (i = 0; i < swapchain_state_table.state_count; ++i) { - swapchain = hook_table.swapchains[i].swapchain; + registered_state = &swapchain_state_table.states[i]; - if (swapchain->state.device_window != msg->hwnd) + if (registered_state->state->device_window != msg->hwnd) continue; - if ((entry = wined3d_find_wndproc(msg->hwnd, swapchain->device->wined3d)) + if ((entry = wined3d_find_wndproc(msg->hwnd, registered_state->wined3d)) && (entry->flags & (WINED3D_REGISTER_WINDOW_NO_WINDOW_CHANGES | WINED3D_REGISTER_WINDOW_NO_ALT_ENTER))) continue; - wined3d_swapchain_get_desc(swapchain, &swapchain_desc); + swapchain_desc = registered_state->state->desc; swapchain_desc.windowed = !swapchain_desc.windowed; - if (!(output = wined3d_get_output_from_window(swapchain->device->wined3d, - swapchain->state.device_window))) + if (!(output = wined3d_get_output_from_window(registered_state->wined3d, + registered_state->state->device_window))) { - ERR("Failed to get output from window %p.\n", swapchain->state.device_window); + ERR("Failed to get output from window %p.\n", registered_state->state->device_window); break; } swapchain_desc.output = output; - wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, NULL); + wined3d_swapchain_state_set_fullscreen(registered_state->state, &swapchain_desc, NULL); wined3d_wndproc_mutex_unlock(); @@ -764,82 +765,84 @@ static struct wined3d_window_hook *wined3d_find_hook(DWORD thread_id) { unsigned int i; - for (i = 0; i < hook_table.hook_count; ++i) + for (i = 0; i < swapchain_state_table.hook_count; ++i) { - if (hook_table.hooks[i].thread_id == thread_id) - return &hook_table.hooks[i]; + if (swapchain_state_table.hooks[i].thread_id == thread_id) + return &swapchain_state_table.hooks[i]; } return NULL; } -void wined3d_hook_swapchain(struct wined3d_swapchain *swapchain) +void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, + struct wined3d *wined3d) { - struct wined3d_hooked_swapchain *swapchain_entry; + struct wined3d_registered_swapchain_state *state_entry; struct wined3d_window_hook *hook; wined3d_wndproc_mutex_lock(); - if (!wined3d_array_reserve((void **)&hook_table.swapchains, &hook_table.swapchains_size, - hook_table.swapchain_count + 1, sizeof(*swapchain_entry))) + if (!wined3d_array_reserve((void **)&swapchain_state_table.states, &swapchain_state_table.states_size, + swapchain_state_table.state_count + 1, sizeof(*state_entry))) { wined3d_wndproc_mutex_unlock(); return; } - swapchain_entry = &hook_table.swapchains[hook_table.swapchain_count++]; - swapchain_entry->swapchain = swapchain; - swapchain_entry->thread_id = GetWindowThreadProcessId(swapchain->state.device_window, NULL); + state_entry = &swapchain_state_table.states[swapchain_state_table.state_count++]; + state_entry->state = state; + state_entry->wined3d = wined3d; + state_entry->thread_id = GetWindowThreadProcessId(state->device_window, NULL); - if ((hook = wined3d_find_hook(swapchain_entry->thread_id))) + if ((hook = wined3d_find_hook(state_entry->thread_id))) { ++hook->count; wined3d_wndproc_mutex_unlock(); return; } - if (!wined3d_array_reserve((void **)&hook_table.hooks, &hook_table.hooks_size, - hook_table.hook_count + 1, sizeof(*hook))) + if (!wined3d_array_reserve((void **)&swapchain_state_table.hooks, &swapchain_state_table.hooks_size, + swapchain_state_table.hook_count + 1, sizeof(*hook))) { - --hook_table.swapchain_count; + --swapchain_state_table.state_count; wined3d_wndproc_mutex_unlock(); return; } - hook = &hook_table.hooks[hook_table.hook_count++]; - hook->thread_id = swapchain_entry->thread_id; + hook = &swapchain_state_table.hooks[swapchain_state_table.hook_count++]; + hook->thread_id = state_entry->thread_id; hook->hook = SetWindowsHookExW(WH_GETMESSAGE, wined3d_hook_proc, 0, hook->thread_id); hook->count = 1; wined3d_wndproc_mutex_unlock(); } -void wined3d_unhook_swapchain(struct wined3d_swapchain *swapchain) +void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) { - struct wined3d_hooked_swapchain *swapchain_entry, *last_swapchain_entry; + struct wined3d_registered_swapchain_state *state_entry, *last_state_entry; struct wined3d_window_hook *hook, *last_hook; unsigned int i; wined3d_wndproc_mutex_lock(); - for (i = 0; i < hook_table.swapchain_count; ++i) + for (i = 0; i < swapchain_state_table.state_count; ++i) { - swapchain_entry = &hook_table.swapchains[i]; + state_entry = &swapchain_state_table.states[i]; - if (swapchain_entry->swapchain != swapchain) + if (state_entry->state != state) continue; - if ((hook = wined3d_find_hook(swapchain_entry->thread_id)) && !--hook->count) + if ((hook = wined3d_find_hook(state_entry->thread_id)) && !--hook->count) { UnhookWindowsHookEx(hook->hook); - last_hook = &hook_table.hooks[--hook_table.hook_count]; + last_hook = &swapchain_state_table.hooks[--swapchain_state_table.hook_count]; if (hook != last_hook) *hook = *last_hook; } - last_swapchain_entry = &hook_table.swapchains[--hook_table.swapchain_count]; - if (swapchain_entry != last_swapchain_entry) - *swapchain_entry = *last_swapchain_entry; + last_state_entry = &swapchain_state_table.states[--swapchain_state_table.state_count]; + if (state_entry != last_state_entry) + *state_entry = *last_state_entry; break; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d932f60fa95..bbb0a60d7bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3522,9 +3522,7 @@ struct wined3d }; BOOL wined3d_filter_messages(HWND window, BOOL filter) DECLSPEC_HIDDEN; -void wined3d_hook_swapchain(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; -void wined3d_unhook_swapchain(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) DECLSPEC_HIDDEN; @@ -5082,10 +5080,13 @@ struct wined3d_swapchain_state HWND device_window; }; +void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, + struct wined3d *wined3d) DECLSPEC_HIDDEN; void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, HWND window, int x, int y, int width, int height) DECLSPEC_HIDDEN; +void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; struct wined3d_swapchain_ops { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 238961006a0..61ab0e90953 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -904,7 +904,7 @@ enum wined3d_shader_type #define WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT 0x00004000u #define WINED3D_SWAPCHAIN_GDI_COMPATIBLE 0x00008000u #define WINED3D_SWAPCHAIN_IMPLICIT 0x00010000u -#define WINED3D_SWAPCHAIN_HOOK 0x00020000u +#define WINED3D_SWAPCHAIN_REGISTER_STATE 0x00020000u #define WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES 0x00040000u #define WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE 0x00080000u @@ -2804,7 +2804,7 @@ void __cdecl wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, - HWND window, struct wined3d_swapchain_state **state); + HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); BOOL __cdecl wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, -- 2.25.1

2 1

[PATCH] kernelbase: return S_OK in WerSetFlags
by Louis Lenders 09 Oct '20

09 Oct '20

https://bugs.winehq.org/show_bug.cgi?id=49966 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernelbase/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 6acdf0f1ea..0382ea9f95 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -819,7 +819,7 @@ HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerRegisterRuntimeExceptionModule( const HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerSetFlags( DWORD flags ) { FIXME("(%d) stub\n", flags); - return E_NOTIMPL; + return S_OK; } -- 2.28.0

1 0

[PATCH vkd3d 1/3] vkd3d-shader: Pass the output pointer to vkd3d_shader_message_context_copy_messages().
by Zebediah Figura 09 Oct '20

09 Oct '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_main.c | 20 +++++++++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 93e7eaf5..3ddca1e9 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2786,7 +2786,7 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, rts0_handler, root_signature); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); @@ -3390,7 +3390,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro done: vkd3d_shader_message_context_trace_messages(&context.message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&context.message_context))) + if (!vkd3d_shader_message_context_copy_messages(&context.message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&context.message_context); return ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index c2fe2c8e..d3d86ed7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -140,14 +140,20 @@ void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_mess vkd3d_string_buffer_trace_(&context->messages, function); } -char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) +bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, char **out) { char *messages; - if ((messages = vkd3d_malloc(context->messages.content_size + 1))) - memcpy(messages, context->messages.buffer, context->messages.content_size + 1); + if (!out) + return true; - return messages; + *out = NULL; + + if (!(messages = vkd3d_malloc(context->messages.content_size + 1))) + return false; + memcpy(messages, context->messages.buffer, context->messages.content_size + 1); + *out = messages; + return true; } void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, @@ -842,7 +848,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char ret = scan_dxbc(compile_info, &message_context); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); return ret; @@ -956,7 +962,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, } vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); return ret; @@ -1046,7 +1052,7 @@ int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f88ea69a..98b5fbc4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -848,7 +848,8 @@ struct vkd3d_shader_message_context }; void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; -char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; +bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, + char **out) DECLSPEC_HIDDEN; bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN; void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, -- 2.28.0

1 2

[PATCH 1/2] ntdll: Zero all FLS slots instances in RtlFlsFree().
by Paul Gofman 09 Oct '20

09 Oct '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/thread.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index cf6bddab0b4..95511391d34 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -392,7 +392,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsFree( ULONG index ) { unsigned int chunk_index, idx; FLS_INFO_CHUNK *chunk; - TEB_FLS_DATA *fls; + LIST_ENTRY *entry; lock_fls_data(); @@ -410,10 +410,15 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsFree( ULONG index ) return STATUS_INVALID_PARAMETER; } - if ((fls = NtCurrentTeb()->FlsSlots) && fls->fls_data_chunks[chunk_index]) + for (entry = fls_data.fls_list_head.Flink; entry != &fls_data.fls_list_head; entry = entry->Flink) { - /* FIXME: call Fls callback */ - fls->fls_data_chunks[chunk_index][idx + 1] = NULL; + TEB_FLS_DATA *fls = CONTAINING_RECORD(entry, TEB_FLS_DATA, fls_list_entry); + + if (fls->fls_data_chunks[chunk_index]) + { + /* FIXME: call Fls callback */ + fls->fls_data_chunks[chunk_index][idx + 1] = NULL; + } } --chunk->count; -- 2.26.2

2 2

[PATCH] dpvoice: Use wide-char string literals.
by Michael Stefaniuc 08 Oct '20

08 Oct '20

Simplfy the calculation of the size of a WCHAR array too. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dpvoice/server.c | 3 +-- dlls/dpvoice/tests/voice.c | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/dpvoice/server.c b/dlls/dpvoice/server.c index 714863f6b24..a476a2e585d 100644 --- a/dlls/dpvoice/server.c +++ b/dlls/dpvoice/server.c @@ -43,8 +43,7 @@ HRESULT DPVOICE_GetCompressionTypes(DVCOMPRESSIONINFO *pData, DWORD *pdwDataSize { static const DVCOMPRESSIONINFO pcm_type = {80, {0x8de12fd4,0x7cb3,0x48ce,{0xa7,0xe8,0x9c,0x47,0xa2,0x2e,0x8a,0xc5}}, NULL, NULL, 0, 64000}; - static const WCHAR pcm_name[] = - {'M','S','-','P','C','M',' ','6','4',' ','k','b','i','t','/','s',0}; + static const WCHAR pcm_name[] = L"MS-PCM 64 kbit/s"; HRESULT ret; LPWSTR string_loc; diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c index 2d77049a9bd..4b44e1e1081 100644 --- a/dlls/dpvoice/tests/voice.c +++ b/dlls/dpvoice/tests/voice.c @@ -37,8 +37,7 @@ static DWORD port = 8888; static HANDLE connected = NULL; static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa6 } }; -static WCHAR sessionname[] = {'w','i','n','e','g','a','m','e','s','s','e','r','v','e','r',0}; -static WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; +static WCHAR sessionname[] = L"winegamesserver"; static HRESULT WINAPI DirectPlayMessageHandler(void *lpvUserContext, DWORD dwMessageId, void *lpMessage) @@ -102,7 +101,7 @@ static BOOL test_init_dpvoice_server(void) hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); ok(hr == S_OK, "SetSP with 0x%08x\n", hr); - hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, localhost, (lstrlenW(localhost)+1)*sizeof(WCHAR), + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, L"localhost", sizeof(L"localhost"), DPNA_DATATYPE_STRING ); ok(hr == S_OK, "AddComponent(addr) with 0x%08x\n", hr); @@ -150,7 +149,7 @@ static BOOL test_init_dpvoice_server(void) static BOOL test_init_dpvoice_client(void) { HRESULT hr; - WCHAR player[] = {'w','i','n','e','u','s','e','r',0}; + WCHAR player[] = L"wineuser"; hr = CoCreateInstance(&CLSID_DirectPlayVoiceClient, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayVoiceClient, (void **)&vclient); if(hr == S_OK) @@ -183,7 +182,7 @@ static BOOL test_init_dpvoice_client(void) hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); ok(hr == S_OK, "SetSP with 0x%08x\n", hr); - hr = IDirectPlay8Address_AddComponent(hostaddr, DPNA_KEY_HOSTNAME, localhost, (lstrlenW(localhost)+1)*sizeof(WCHAR), + hr = IDirectPlay8Address_AddComponent(hostaddr, DPNA_KEY_HOSTNAME, L"localhost", sizeof(L"localhost"), DPNA_DATATYPE_STRING ); ok(hr == S_OK, "AddComponent(addr) with 0x%08x\n", hr); -- 2.26.2

1 0

[PATCH] credui: Use wide-char string literals.
by Michael Stefaniuc 08 Oct '20

08 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/credui/credui_main.c | 9 +++------ dlls/credui/tests/credui.c | 30 ++++++++++-------------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 93ccdc20ded..f08d1406f90 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -868,9 +868,6 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, PSEC_WINNT_AUTH_IDENTITY_OPAQUE *output_id, BOOL *save, DWORD sspi_flags ) { - static const WCHAR basicW[] = {'B','a','s','i','c',0}; - static const WCHAR ntlmW[] = {'N','T','L','M',0}; - static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',0}; WCHAR username[CREDUI_MAX_USERNAME_LENGTH + 1] = {0}; WCHAR password[CREDUI_MAX_PASSWORD_LENGTH + 1] = {0}; DWORD len_username = ARRAY_SIZE(username); @@ -883,8 +880,8 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, error, debugstr_w(package), input_id, output_id, save, sspi_flags ); if (!target) return ERROR_INVALID_PARAMETER; - if (!package || (wcsicmp( package, basicW ) && wcsicmp( package, ntlmW ) && - wcsicmp( package, negotiateW ))) + if (!package || (wcsicmp( package, L"Basic" ) && wcsicmp( package, L"NTLM" ) && + wcsicmp( package, L"Negotiate" ))) { FIXME( "package %s not supported\n", debugstr_w(package) ); return ERROR_NO_SUCH_PACKAGE; @@ -923,7 +920,7 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, { user = ptr + 1; len_username = lstrlenW( user ); - if (!wcsicmp( package, ntlmW ) || !wcsicmp( package, negotiateW )) + if (!wcsicmp( package, L"NTLM" ) || !wcsicmp( package, L"Negotiate" )) { domain = username; len_domain = ptr - username; diff --git a/dlls/credui/tests/credui.c b/dlls/credui/tests/credui.c index 13fbd41c07c..f2b71d603cc 100644 --- a/dlls/credui/tests/credui.c +++ b/dlls/credui/tests/credui.c @@ -36,7 +36,7 @@ static ULONG (SEC_ENTRY *pSspiPromptForCredentialsW) static void test_CredUIPromptForCredentials(void) { - static const WCHAR wszServerName[] = {'W','i','n','e','T','e','s','t',0}; + static const WCHAR wszServerName[] = L"WineTest"; DWORD ret; WCHAR username[256]; WCHAR password[256]; @@ -77,14 +77,6 @@ static void test_CredUIPromptForCredentials(void) if (winetest_interactive) { - static const WCHAR wszCaption1[] = {'C','R','E','D','U','I','_','F','L','A','G','S','_','E','X','P','E','C','T','_','C','O','N','F','I','R','M','A','T','I','O','N',0}; - static const WCHAR wszCaption2[] = {'C','R','E','D','U','I','_','F','L','A','G','S','_','I','N','C','O','R','R','E','C','T','_','P','A','S','S','W','O','R','D','|', - 'C','R','E','D','U','I','_','F','L','A','G','S','_','E','X','P','E','C','T','_','C','O','N','F','I','R','M','A','T','I','O','N',0}; - static const WCHAR wszCaption3[] = {'C','R','E','D','U','I','_','F','L','A','G','S','_','D','O','_','N','O','T','_','P','E','R','S','I','S','T','|', - 'C','R','E','D','U','I','_','F','L','A','G','S','_','E','X','P','E','C','T','_','C','O','N','F','I','R','M','A','T','I','O','N',0}; - static const WCHAR wszCaption4[] = {'C','R','E','D','U','I','_','F','L','A','G','S','_','P','E','R','S','I','S','T','|', - 'C','R','E','D','U','I','_','F','L','A','G','S','_','E','X','P','E','C','T','_','C','O','N','F','I','R','M','A','T','I','O','N',0}; - ret = CredUIPromptForCredentialsW(NULL, wszServerName, NULL, 0, username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), @@ -96,7 +88,7 @@ static void test_CredUIPromptForCredentials(void) ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); } - credui_info.pszCaptionText = wszCaption1; + credui_info.pszCaptionText = L"CREDUI_FLAGS_EXPECT_CONFIRMATION"; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, ERROR_ACCESS_DENIED, username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), @@ -108,7 +100,7 @@ static void test_CredUIPromptForCredentials(void) ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); } - credui_info.pszCaptionText = wszCaption2; + credui_info.pszCaptionText = L"CREDUI_FLAGS_INCORRECT_PASSWORD|CREDUI_FLAGS_EXPECT_CONFIRMATION"; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0, username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), @@ -122,7 +114,7 @@ static void test_CredUIPromptForCredentials(void) save = TRUE; - credui_info.pszCaptionText = wszCaption3; + credui_info.pszCaptionText = L"CREDUI_FLAGS_DO_NOT_PERSIST|CREDUI_FLAGS_EXPECT_CONFIRMATION"; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0, username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), @@ -131,7 +123,7 @@ static void test_CredUIPromptForCredentials(void) ok(save, "save flag should have been untouched\n"); save = FALSE; - credui_info.pszCaptionText = wszCaption4; + credui_info.pszCaptionText = L"CREDUI_FLAGS_PERSIST|CREDUI_FLAGS_EXPECT_CONFIRMATION"; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0, username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), @@ -149,8 +141,6 @@ static void test_CredUIPromptForCredentials(void) static void test_SspiPromptForCredentials(void) { - static const WCHAR targetW[] = {'S','s','p','i','T','e','s','t',0}; - static const WCHAR basicW[] = {'b','a','s','i','c',0}; ULONG ret; SECURITY_STATUS status; CREDUI_INFOW info; @@ -166,20 +156,20 @@ static void test_SspiPromptForCredentials(void) info.cbSize = sizeof(info); info.hwndParent = NULL; - info.pszMessageText = targetW; - info.pszCaptionText = basicW; + info.pszMessageText = L"SspiTest"; + info.pszCaptionText = L"basic"; info.hbmBanner = NULL; - ret = pSspiPromptForCredentialsW( NULL, &info, 0, basicW, NULL, &id, &save, 0 ); + ret = pSspiPromptForCredentialsW( NULL, &info, 0, L"basic", NULL, &id, &save, 0 ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ret = pSspiPromptForCredentialsW( targetW, &info, 0, NULL, NULL, &id, &save, 0 ); + ret = pSspiPromptForCredentialsW( L"SspiTest", &info, 0, NULL, NULL, &id, &save, 0 ); ok( ret == ERROR_NO_SUCH_PACKAGE, "got %u\n", ret ); if (winetest_interactive) { id = NULL; save = -1; - ret = pSspiPromptForCredentialsW( targetW, &info, 0, basicW, NULL, &id, &save, 0 ); + ret = pSspiPromptForCredentialsW( L"SspiTest", &info, 0, L"basic", NULL, &id, &save, 0 ); ok( ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "got %u\n", ret ); if (ret == ERROR_SUCCESS) { -- 2.26.2

1 0

[PATCH] eject: Use wide-char string literals.
by Michael Stefaniuc 08 Oct '20

08 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/eject/eject.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/eject/eject.c b/programs/eject/eject.c index 0a081cfdf56..e6416eacff7 100644 --- a/programs/eject/eject.c +++ b/programs/eject/eject.c @@ -37,17 +37,15 @@ static BOOL eject_all; /* wrapper for GetDriveTypeW */ static DWORD get_drive_type( WCHAR drive ) { - static const WCHAR rootW[] = {'a',':','\\',0}; WCHAR path[16]; - memcpy( path, rootW, sizeof(rootW) ); + lstrcpyW( path, L"a:\\" ); path[0] = drive; return GetDriveTypeW( path ); } static BOOL eject_cd( WCHAR drive ) { - static const WCHAR deviceW[] = {'\\','\\','.','\\','a',':',0}; PREVENT_MEDIA_REMOVAL removal; WCHAR buffer[16]; HANDLE handle; @@ -59,7 +57,7 @@ static BOOL eject_cd( WCHAR drive ) return FALSE; } - memcpy( buffer, deviceW, sizeof(deviceW) ); + lstrcpyW( buffer, L"\\\\.\\a:" ); buffer[4] = drive; handle = CreateFileW( buffer, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); -- 2.26.2

1 0

[PATCH] ntoskrnl.exe: Stub MmProtectMdlSystemAddress.
by Myah Caron 08 Oct '20

08 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e94feabc826..4092e33db43 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3145,6 +3145,15 @@ BOOLEAN WINAPI MmIsThisAnNtAsSystem(void) return FALSE; } +/*********************************************************************** + * MmProtectMdlSystemAddress (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI MmProtectMdlSystemAddress(PMDL MemoryDescriptorList, ULONG NewProtect) +{ + FIXME("(%p, %u) stub\n", MemoryDescriptorList, NewProtect); + return STATUS_SUCCESS; +} + /*********************************************************************** * MmQuerySystemSize (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8892fde5054..6ac70c718f1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -733,7 +733,7 @@ @ stdcall MmProbeAndLockPages(ptr long long) @ stub MmProbeAndLockProcessPages @ stub MmProbeAndLockSelectedPages -@ stub MmProtectMdlSystemAddress +@ stdcall MmProtectMdlSystemAddress(ptr long) @ stdcall MmQuerySystemSize() @ stub MmRemovePhysicalMemory @ stdcall MmResetDriverPaging(ptr) -- 2.28.0

1 0

[PATCH v2 1/5] winegstreamer: Insert videoconvert into decoded-video streams.
by Derek Lesho 08 Oct '20

08 Oct '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: - Use fixed list of supported formats in the videoconvert path instead of querying the template. - Moved code setting "caps" appsink property to patch 4, where it begins to be used. - Addressed some comments. --- dlls/winegstreamer/media_source.c | 124 ++++++++++++++++++++++++++---- 1 file changed, 110 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5f3c43a0204..cbee412030d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -384,6 +384,43 @@ static const IMFMediaStreamVtbl media_stream_vtbl = media_stream_RequestSample }; +/* Setup a chain of elements which should hopefully allow transformations to any IMFMediaType + the user throws at us through gstreamer's caps negotiation. */ +static HRESULT media_stream_connect_to_sink(struct media_stream *stream) +{ + GstCaps *source_caps = gst_pad_query_caps(stream->their_src, NULL); + const gchar *stream_type; + + if (!source_caps) + return E_FAIL; + + stream_type = gst_structure_get_name(gst_caps_get_structure(source_caps, 0)); + gst_caps_unref(source_caps); + + if (!strcmp(stream_type, "video/x-raw")) + { + GstElement *videoconvert = gst_element_factory_make("videoconvert", NULL); + + gst_bin_add(GST_BIN(stream->parent_source->container), videoconvert); + + stream->my_sink = gst_element_get_static_pad(videoconvert, "sink"); + + if (!gst_element_link(videoconvert, stream->appsink)) + return E_FAIL; + + gst_element_sync_state_with_parent(videoconvert); + } + else + { + stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink"); + } + + if (gst_pad_link(stream->their_src, stream->my_sink) != GST_PAD_LINK_OK) + return E_FAIL; + + return S_OK; +} + static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD stream_id, struct media_stream **out_stream) { struct media_stream *object = heap_alloc_zero(sizeof(*object)); @@ -414,8 +451,8 @@ static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD g_object_set(object->appsink, "sync", FALSE, NULL); g_object_set(object->appsink, "max-buffers", 5, NULL); - object->my_sink = gst_element_get_static_pad(object->appsink, "sink"); - gst_pad_link(object->their_src, object->my_sink); + if (FAILED(hr = media_stream_connect_to_sink(object))) + goto fail; gst_element_sync_state_with_parent(object->appsink); @@ -435,28 +472,87 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) { GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src); IMFMediaTypeHandler *type_handler; + IMFMediaType **stream_types = NULL; IMFMediaType *stream_type = NULL; + DWORD type_count = 0; + const gchar *major_type; + unsigned int i; HRESULT hr; - stream_type = mf_media_type_from_caps(current_caps); - gst_caps_unref(current_caps); - if (!stream_type) - return E_FAIL; + major_type = gst_structure_get_name(gst_caps_get_structure(current_caps, 0)); + + if (!strcmp(major_type, "video/x-raw")) + { + /* These are the most common native output types of decoders: https://docs.microsoft.com/en-us/windows/win32/medfound/mft-decoder-expose-… */ + static const GUID * video_types[] = + { + &MFVideoFormat_NV12, + &MFVideoFormat_YV12, + &MFVideoFormat_YUY2, + &MFVideoFormat_IYUV, + &MFVideoFormat_I420, + }; - hr = MFCreateStreamDescriptor(stream->stream_id, 1, &stream_type, &stream->descriptor); + IMFMediaType *base_type = mf_media_type_from_caps(current_caps); + GUID base_subtype; - IMFMediaType_Release(stream_type); + IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype); - if (FAILED(hr)) - return hr; + stream_types = heap_alloc( sizeof(IMFMediaType *) * ARRAY_SIZE(video_types) + 1); - if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) - return hr; + stream_types[0] = base_type; + type_count = 1; - hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_type); + for (i = 0; i < ARRAY_SIZE(video_types); i++) + { + IMFMediaType *new_type; - IMFMediaTypeHandler_Release(type_handler); + if (IsEqualGUID(&base_subtype, video_types[i])) + continue; + if (FAILED(hr = MFCreateMediaType(&new_type))) + goto done; + stream_types[type_count++] = new_type; + + if (FAILED(hr = IMFMediaType_CopyAllItems(base_type, (IMFAttributes *) new_type))) + goto done; + if (FAILED(hr = IMFMediaType_SetGUID(new_type, &MF_MT_SUBTYPE, video_types[i]))) + goto done; + } + } + else + { + stream_type = mf_media_type_from_caps(current_caps); + if (stream_type) + { + stream_types = &stream_type; + type_count = 1; + } + } + + if (!type_count) + { + ERR("Failed to establish an IMFMediaType from any of the possible stream caps!\n"); + return E_FAIL; + } + + if (FAILED(hr = MFCreateStreamDescriptor(stream->stream_id, type_count, stream_types, &stream->descriptor))) + goto done; + + if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) + goto done; + + if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0]))) + goto done; + +done: + gst_caps_unref(current_caps); + if (type_handler) + IMFMediaTypeHandler_Release(type_handler); + for (i = 0; i < type_count; i++) + IMFMediaType_Release(stream_types[i]); + if (stream_types != &stream_type) + heap_free(stream_types); return hr; } -- 2.28.0

4 21

[PATCH 1/2] qedit/tests: Add some basic tests for null renderer connection and streaming.
by Zebediah Figura 08 Oct '20

08 Oct '20

Adapted from the video renderer tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I had this patch in my local tree since a while, but never got around to finishing it. dlls/qedit/tests/nullrenderer.c | 464 ++++++++++++++++++++++++++++++++ 1 file changed, 464 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 8f26e4716ec..3285e22e5c7 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "dshow.h" +#include "wine/strmbase.h" #include "wine/test.h" static IBaseFilter *create_null_renderer(void) @@ -420,6 +421,468 @@ static void test_enum_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; +}; + +static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + if (!index) + return &filter->source.pin; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + strmbase_source_cleanup(&filter->source); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) +{ + return S_OK; +} + +static const struct strmbase_source_ops testsource_ops = +{ + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); +} + +static void test_allocator(IMemInputPin *input) +{ + IMemAllocator *req_allocator, *ret_allocator; + ALLOCATOR_PROPERTIES props; + HRESULT hr; + + hr = IMemInputPin_GetAllocatorRequirements(input, &props); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (hr == S_OK) + { + hr = IMemAllocator_GetProperties(ret_allocator, &props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!props.cBuffers, "Got %d buffers.\n", props.cBuffers); + ok(!props.cbBuffer, "Got size %d.\n", props.cbBuffer); + ok(!props.cbAlign, "Got alignment %d.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix); + + hr = IMemInputPin_NotifyAllocator(input, ret_allocator, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMemAllocator_Release(ret_allocator); + } + + hr = IMemInputPin_NotifyAllocator(input, NULL, TRUE); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&req_allocator); + + hr = IMemInputPin_NotifyAllocator(input, req_allocator, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_allocator == req_allocator, "Allocators didn't match.\n"); + + IMemAllocator_Release(req_allocator); + IMemAllocator_Release(ret_allocator); +} + +struct frame_thread_params +{ + IMemInputPin *sink; + IMediaSample *sample; +}; + +static DWORD WINAPI frame_thread(void *arg) +{ + struct frame_thread_params *params = arg; + HRESULT hr; + + if (winetest_debug > 1) trace("%04x: Sending frame.\n", GetCurrentThreadId()); + hr = IMemInputPin_Receive(params->sink, params->sample); + if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr); + IMediaSample_Release(params->sample); + free(params); + return hr; +} + +static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, unsigned char color) +{ + struct frame_thread_params *params = malloc(sizeof(*params)); + IMemAllocator *allocator; + REFERENCE_TIME end_time; + IMediaSample *sample; + HANDLE thread; + HRESULT hr; + BYTE *data; + + hr = IMemInputPin_GetAllocator(sink, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + memset(data, color, 32 * 16 * 2); + + hr = IMediaSample_SetActualDataLength(sample, 32 * 16 * 2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time *= 10000000; + end_time = start_time + 10000000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + params->sink = sink; + params->sample = sample; + thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); + + IMemAllocator_Release(allocator); + return thread; +} + +static HANDLE send_frame(IMemInputPin *sink) +{ + return send_frame_time(sink, 0, 0x55); /* purple */ +} + +static HRESULT join_thread_(int line, HANDLE thread) +{ + DWORD ret; + ok_(__FILE__, line)(!WaitForSingleObject(thread, 1000), "Wait failed.\n"); + GetExitCodeThread(thread, &ret); + CloseHandle(thread); + return ret; +} +#define join_thread(a) join_thread_(__LINE__, a) + +static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) +{ + IMemAllocator *allocator; + IMediaControl *control; + IMediaSample *sample; + OAFilterState state; + HANDLE thread; + HRESULT hr; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + + thread = send_frame(input); + hr = join_thread(thread); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + /* The renderer is not fully paused until it receives a sample. The thread + * sending the sample blocks in IMemInputPin_Receive() until the filter is + * stopped or run. */ + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* The sink will decommit our allocator for us when stopping, and recommit + * it when pausing. */ + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + todo_wine ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); + if (hr == S_OK) IMediaSample_Release(sample); + + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + thread = send_frame(input); + hr = join_thread(thread); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame(input); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + thread = send_frame(input); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMemAllocator_Release(allocator); + IMediaControl_Release(control); +} + +static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +{ + IMediaControl *control; + OAFilterState state; + HANDLE thread; + HRESULT hr; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame(input); + hr = join_thread(thread); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* We dropped the sample we were holding, so now we need a new one... */ + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMediaControl_Release(control); +} + +static void test_connect_pin(void) +{ + static const AM_MEDIA_TYPE req_mt = + { + .majortype = {0x111}, + .subtype = {0x222}, + .formattype = {0x333}, + }; + ALLOCATOR_PROPERTIES req_props = {1, 32 * 16 * 4, 1, 0}, ret_props; + IBaseFilter *filter = create_null_renderer(); + struct testfilter source; + IMemAllocator *allocator; + IFilterGraph2 *graph; + IMemInputPin *input; + AM_MEDIA_TYPE mt; + IPin *pin, *peer; + HRESULT hr; + ULONG ref; + + testfilter_init(&source); + + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, filter, L"sink"); + + IBaseFilter_FindPin(filter, L"In", &pin); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer == &source.source.pin.IPin_iface, "Got peer %p.\n", peer); + IPin_Release(peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(&mt, &req_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); + + test_allocator(input); + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(&ret_props, &req_props, sizeof(req_props)), "Properties did not match.\n"); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMemAllocator_Release(allocator); + + hr = IMemInputPin_ReceiveCanBlock(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + test_filter_state(input, graph); + test_flushing(pin, input, graph); + + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(source.source.pin.peer == pin, "Got peer %p.\n", peer); + IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + IMemInputPin_Release(input); + IPin_Release(pin); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -443,6 +906,7 @@ START_TEST(nullrenderer) test_aggregation(); test_media_types(); test_enum_media_types(); + test_connect_pin(); CoUninitialize(); } -- 2.28.0

1 1

[PATCH v2 2/2] dssenh: Register the DSS provider.
by Hans Leidekker 08 Oct '20

08 Oct '20

Note that tests will fail on the testbot because the prefix isn't updated. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/Makefile.in | 2 ++ dlls/dssenh/dssenh.rgs | 56 ++++++++++++++++++++++++++++++++++++++ dlls/dssenh/main.c | 22 +++++++++------ dlls/dssenh/rsrc.rc | 22 +++++++++++++++ dlls/dssenh/tests/dssenh.c | 5 ++-- 5 files changed, 95 insertions(+), 12 deletions(-) create mode 100644 dlls/dssenh/dssenh.rgs create mode 100644 dlls/dssenh/rsrc.rc diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in index 4f05beee518..8015768f99b 100644 --- a/dlls/dssenh/Makefile.in +++ b/dlls/dssenh/Makefile.in @@ -4,3 +4,5 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c + +RC_SRCS = rsrc.rc diff --git a/dlls/dssenh/dssenh.rgs b/dlls/dssenh/dssenh.rgs new file mode 100644 index 00000000000..0e9bad7c17c --- /dev/null +++ b/dlls/dssenh/dssenh.rgs @@ -0,0 +1,56 @@ +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Cryptography + { + NoRemove Defaults + { + NoRemove Provider + { + ForceRemove 'Microsoft Base DSS Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 3 + } + ForceRemove 'Microsoft Base DSS and Diffie-Hellman Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 13 + } + ForceRemove 'Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 13 + } + ForceRemove 'Microsoft DH SChannel Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 18 + } + } + NoRemove 'Provider Types' + { + ForceRemove 'Type 003' + { + val 'Name' = s 'Microsoft Base DSS Cryptographic Provider' + val 'TypeName' = s 'DSS Signature' + } + ForceRemove 'Type 013' + { + val 'Name' = s 'Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider' + val 'TypeName' = s 'DSS Signature with Diffie-Hellman Key Exchange' + } + ForceRemove 'Type 018' + { + val 'Name' = s 'Microsoft DH SChannel Cryptographic Provider' + val 'TypeName' = s 'Diffie-Hellman SChannel' + } + } + } + } + } + } +} diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 80551cf578b..5aa885c8b86 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -22,8 +22,13 @@ #include "windef.h" #include "winbase.h" #include "wincrypt.h" +#include "objbase.h" +#include "rpcproxy.h" + #include "wine/debug.h" +static HINSTANCE instance; + WINE_DEFAULT_DEBUG_CHANNEL(dssenh); BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) @@ -106,11 +111,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + instance = hinstDLL; + DisableThreadLibraryCalls(hinstDLL); + break; } return TRUE; } @@ -120,8 +126,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) */ HRESULT WINAPI DllRegisterServer(void) { - FIXME("Not implemented.\n"); - return E_UNEXPECTED; + return __wine_register_resources( instance ); } /***************************************************** @@ -129,6 +134,5 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - FIXME("Not implemented.\n"); - return E_UNEXPECTED; + return __wine_unregister_resources( instance ); } diff --git a/dlls/dssenh/rsrc.rc b/dlls/dssenh/rsrc.rc new file mode 100644 index 00000000000..ac5ba6258e0 --- /dev/null +++ b/dlls/dssenh/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Resources for dssenh + * + * Copyright 2020 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: dssenh.rgs */ +1 WINE_REGISTRY dssenh.rgs diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 7a16acc6790..c88fcd14661 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -54,7 +54,6 @@ static void test_acquire_context(void) /* cannot acquire along with PROV_RSA_SIG, not compatible */ SetLastError(0xdeadbeef); result = CryptAcquireContextA(&hProv, NULL, MS_DEF_DSS_PROV_A, PROV_RSA_SIG, 0); - todo_wine ok(!result && GetLastError() == NTE_PROV_TYPE_NO_MATCH, "Expected NTE_PROV_TYPE_NO_MATCH, got %08x\n", GetLastError()); @@ -574,7 +573,7 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptAcquireContextA( &hProv, NULL, MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); - if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) + if (!result) { skip("DSSENH is currently not available, skipping encryption tests.\n"); return; @@ -665,7 +664,7 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptAcquireContextA( &hProv, NULL, MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); - if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) + if (!result) { skip("DSSENH is currently not available, skipping block cipher mode tests.\n"); return; -- 2.28.0

2 1

[PATCH v2 1/2] dssenh: Add stub implementations for a couple of functions.
by Hans Leidekker 08 Oct '20

08 Oct '20

v2: Include CPGetProvParam. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/dssenh.spec | 28 +++++++-------- dlls/dssenh/main.c | 75 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 14 deletions(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index c5c25452814..2d93a98796a 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -1,27 +1,27 @@ -@ stub CPAcquireContext -@ stub CPCreateHash +@ stdcall CPAcquireContext(ptr str long ptr) +@ stdcall CPCreateHash(ptr long ptr long ptr) @ stub CPDecrypt -@ stub CPDeriveKey -@ stub CPDestroyHash -@ stub CPDestroyKey +@ stdcall CPDeriveKey(ptr long ptr long ptr) +@ stdcall CPDestroyHash(ptr ptr) +@ stdcall CPDestroyKey(ptr ptr) @ stub CPDuplicateHash @ stub CPDuplicateKey @ stub CPEncrypt -@ stub CPExportKey -@ stub CPGenKey +@ stdcall CPExportKey(ptr ptr ptr long long ptr ptr) +@ stdcall CPGenKey(ptr long long ptr) @ stub CPGenRandom -@ stub CPGetHashParam +@ stdcall CPGetHashParam(ptr ptr long ptr ptr long) @ stub CPGetKeyParam -@ stub CPGetProvParam +@ stdcall CPGetProvParam(ptr long ptr ptr long) @ stub CPGetUserKey -@ stub CPHashData +@ stdcall CPHashData(ptr ptr ptr long long) @ stub CPHashSessionKey -@ stub CPImportKey -@ stub CPReleaseContext +@ stdcall CPImportKey(ptr ptr long ptr long ptr) +@ stdcall CPReleaseContext(ptr long) @ stub CPSetHashParam @ stub CPSetKeyParam @ stub CPSetProvParam -@ stub CPSignHash -@ stub CPVerifySignature +@ stdcall CPSignHash(ptr ptr long wstr long ptr ptr) +@ stdcall CPVerifySignature(ptr ptr ptr long ptr wstr long) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index b60b3447a36..80551cf578b 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -21,10 +21,85 @@ #include "windef.h" #include "winbase.h" +#include "wincrypt.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dssenh); +BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) +{ + return FALSE; +} + +BOOL WINAPI CPReleaseContext( HCRYPTPROV hprov, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPGetProvParam( HCRYPTPROV hprov, DWORD param, BYTE *data, DWORD *len, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPGenKey( HCRYPTPROV hprov, ALG_ID algid, DWORD flags, HCRYPTKEY *ret_key ) +{ + return FALSE; +} + +BOOL WINAPI CPDestroyKey( HCRYPTPROV hprov, HCRYPTKEY hkey ) +{ + return FALSE; +} + +BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKEY hpubkey, DWORD flags, + HCRYPTKEY *ret_key ) +{ + return FALSE; +} + +BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DWORD blobtype, DWORD flags, + BYTE *data, DWORD *len ) +{ + return FALSE; +} + +BOOL WINAPI CPCreateHash( HCRYPTPROV hprov, ALG_ID algid, HCRYPTKEY hkey, DWORD flags, HCRYPTHASH *ret_hash ) +{ + return FALSE; +} + +BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) +{ + return FALSE; +} + +BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYTE *data, DWORD *len, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPDeriveKey( HCRYPTPROV hprov, ALG_ID algid, HCRYPTHASH hhash, DWORD flags, HCRYPTKEY *ret_key ) +{ + return FALSE; +} + +BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const WCHAR *desc, DWORD flags, BYTE *sig, + DWORD *siglen ) +{ + return FALSE; +} + +BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *sig, DWORD siglen, HCRYPTKEY hpubkey, + const WCHAR *desc, DWORD flags ) +{ + return FALSE; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); -- 2.28.0

1 0

[PATCH 7/7] conhost: Support painting screen buffer.
by Jacek Caban 08 Oct '20

08 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 12 ++++++++++-- programs/conhost/conhost.h | 1 + programs/conhost/window.c | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-)

1 0

[PATCH 6/7] conhost: Update window config in ioctl handlers when needed.
by Jacek Caban 08 Oct '20

08 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 13 ++++++++++--- programs/conhost/conhost.h | 2 ++ programs/conhost/window.c | 13 +++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-)

1 0

[PATCH 5/7] conhost: Import window state update from wineconsole.
by Jacek Caban 08 Oct '20

08 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 5 - programs/conhost/conhost.h | 5 + programs/conhost/window.c | 259 +++++++++++++++++++++++++++++++++++++ 3 files changed, 264 insertions(+), 5 deletions(-)

1 0

[PATCH 4/7] conhost: Import font selection support from wineconsole.
by Jacek Caban 08 Oct '20

08 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/window.c | 356 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 356 insertions(+)

1 0

[PATCH 3/7] conhost: Import loading console config from wineconsole.
by Jacek Caban 08 Oct '20

08 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/Makefile.in | 2 +- programs/conhost/conhost.c | 2 +- programs/conhost/conhost.h | 1 + programs/conhost/window.c | 276 +++++++++++++++++++++++++++++++++++ 4 files changed, 279 insertions(+), 2 deletions(-)

1 0

[PATCH 2/7] conhost: Pump window messages when we have a window.
by Jacek Caban 08 Oct '20

08 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)

1 0

[PATCH 1/7] conhost: Initial support for creating console window.
by Jacek Caban 08 Oct '20

08 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The plan is to move console window support to conhost (where it will use the new architecture), allowing removal of the code for the old console architecture in kernel32/server/wineconsole. Once we have complete support in conhost, I will change AllocConsole() to use it instead of wineconsole and reimplement wineconsole as a simple AllocConsole wrapper. This series implements enough window support to pass Wine tests (although to run tests in a way that will exercise that, patching AllocConsole as mentioned above). Interactivity support will follow. programs/conhost/Makefile.in | 6 +- programs/conhost/conhost.c | 121 +++---------------------------- programs/conhost/conhost.h | 135 +++++++++++++++++++++++++++++++++++ programs/conhost/window.c | 101 ++++++++++++++++++++++++++ 4 files changed, 248 insertions(+), 115 deletions(-) create mode 100644 programs/conhost/conhost.h create mode 100644 programs/conhost/window.c

1 0

[PATCH 1/3] comctl32/ipaddress: Select field contents on IPM_SETFOCUS.
by Nikolay Sivov 08 Oct '20

08 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/ipaddress.c | 1 + dlls/comctl32/tests/ipaddress.c | 54 +++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index c75a1085650..d415a96fb74 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -393,6 +393,7 @@ static void IPADDRESS_SetFocusToField (const IPADDRESS_INFO *infoPtr, INT index) if (index > 3 || index < 0) index=0; + SendMessageW (infoPtr->Part[index].EditHwnd, EM_SETSEL, 0, -1); SetFocus (infoPtr->Part[index].EditHwnd); } diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index cc79b7bf11b..c1be745f258 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -62,17 +62,71 @@ static void test_get_set_text(void) DestroyWindow(hwnd); } +struct child_enum +{ + HWND fields[4]; + unsigned int count; +}; + +static BOOL CALLBACK test_child_enum_proc(HWND hwnd, LPARAM param) +{ + struct child_enum *child_enum = (struct child_enum *)param; + char buff[16] = { 0 }; + unsigned int index; + + GetWindowTextA(hwnd, buff, ARRAY_SIZE(buff)); + index = atoi(buff); + ok(index < 4, "Unexpected index.\n"); + if (index < 4) + child_enum->fields[index] = hwnd; + + return ++child_enum->count < 4; +} + +static void test_IPM_SETFOCUS(void) +{ + struct child_enum child_enum = { 0 }; + unsigned int ret, from, to, i; + HWND hwnd; + + hwnd = create_ipaddress_control(); + ok(!!hwnd, "Failed to create control.\n"); + + ret = SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(0, 1, 2, 3)); + ok(ret, "Unexpected return value %u.\n", ret); + + EnumChildWindows(hwnd, test_child_enum_proc, (LPARAM)&child_enum); + ok(child_enum.count == 4, "Unexpected child count %u.\n", child_enum.count); + + for (i = 0; i < 3; ++i) + SendMessageA(child_enum.fields[i], EM_SETSEL, -1, 0); + + SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + ok(from == 0 && to == 0, "Unexpected selection %u x %u.\n", from, to); + + ret = SendMessageA(hwnd, IPM_SETFOCUS, 0, 0); +todo_wine + ok(ret, "Unexpected return value %u.\n", ret); + + SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + ok(from == 0 && to == 1, "Unexpected selection %u x %u.\n", from, to); + + DestroyWindow(hwnd); +} + START_TEST(ipaddress) { ULONG_PTR cookie; HANDLE ctxt; test_get_set_text(); + test_IPM_SETFOCUS(); if (!load_v6_module(&cookie, &ctxt)) return; test_get_set_text(); + test_IPM_SETFOCUS(); unload_v6_module(cookie, ctxt); } -- 2.28.0

1 2

[PATCH 2/2] ntdll/tests: Add tests for RtlEncode(System)Pointer.
by Myah Caron 08 Oct '20

08 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- I'm sending this in without an implementation in case there's anything I need to change, as the implementation would mostly be a copy+paste job I believe (with the exception of implementing both process/usd cookies). It turns out that newer Windows versions rotate the cookie and the pointer right by an amount specified by the first 31/63 bits before XORing them. Unfortunately I couldn't find any mention of how this algorithm worked on google, so I had to spend some time to figure it out. If you're curious, here's the file I created to test how the the algorithm worked (sorry for the mess): https://github.com/qsniyg/wine_dll_load_test/blob/master/encodeptr.c dlls/ntdll/tests/rtl.c | 83 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7a62670ea05..416264bac0f 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -82,6 +82,11 @@ static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, U static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); static NTSTATUS (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **); static NTSTATUS (WINAPI *pLdrUnregisterDllNotification)(void *); +static VOID* (WINAPI *pRtlEncodePointer)(void *); +static VOID* (WINAPI *pRtlDecodePointer)(void *); +static VOID* (WINAPI *pRtlEncodeSystemPointer)(void *); +static VOID* (WINAPI *pRtlDecodeSystemPointer)(void *); +static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -122,6 +127,11 @@ static void InitFunctionPtrs(void) pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification"); pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification"); + pRtlEncodePointer = (void *)GetProcAddress(hntdll, "RtlEncodePointer"); + pRtlDecodePointer = (void *)GetProcAddress(hntdll, "RtlDecodePointer"); + pRtlEncodeSystemPointer = (void *)GetProcAddress(hntdll, "RtlEncodeSystemPointer"); + pRtlDecodeSystemPointer = (void *)GetProcAddress(hntdll, "RtlDecodeSystemPointer"); + pNtQueryInformationProcess = (void *)GetProcAddress(hntdll, "NtQueryInformationProcess"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -3483,6 +3493,78 @@ static void test_LdrRegisterDllNotification(void) pLdrUnregisterDllNotification(cookie); } +static void* our_encode_pointer(void* addr, ULONG cookie) +{ + int shift_amount; + uintptr_t rot_addr; + uintptr_t rot_cookie; + +#ifdef _WIN64 + shift_amount = cookie & 63; +#define ROTR _rotr64 +#else + shift_amount = cookie & 31; +#define ROTR _rotr +#endif + + rot_addr = ROTR((uintptr_t)addr, shift_amount); + rot_cookie = ROTR((uintptr_t)cookie, shift_amount); + + return (void*)(rot_addr ^ rot_cookie); +} + +static void test_RtlEncodePointer(void) +{ + void *addr = (void*)0xdeadbeef0123abcd; + void *encoded, *encoded1, *decoded; + void *our_encoded; + ULONG process_cookie = 0xdeadbeef; + ULONG system_cookie = *(ULONG*)(0x7ffe0000 + 0x330); /* user_shared_data.Cookie */ + NTSTATUS status; + + if (!pRtlEncodePointer || !pRtlDecodePointer) + { + win_skip("RtlEn/DecodePointer not available\n"); + return; + } + + encoded = pRtlEncodePointer(addr); + ok(encoded != addr, "got %p\n", encoded); + + decoded = pRtlDecodePointer(encoded); + ok(decoded == addr, "got %p\n", decoded); + + if (!pNtQueryInformationProcess) + { + win_skip("NtQueryInformationProcess not available\n"); + } + else + { + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessCookie, &process_cookie, sizeof(process_cookie), NULL); + ok(status == S_OK, "got %08x\n", status); + ok(process_cookie != 0xdeadbeef, "got %08x\n", process_cookie); + + our_encoded = our_encode_pointer(addr, process_cookie); + todo_wine ok(encoded == our_encoded || broken(encoded == (void*)((uintptr_t)addr ^ (uintptr_t)process_cookie)), "got %p (ours %p)\n", encoded, our_encoded); + } + + if (!pRtlEncodeSystemPointer || !pRtlDecodeSystemPointer) + { + win_skip("RtlEn/DecodeSystemPointer not available\n"); + return; + } + + encoded1 = pRtlEncodeSystemPointer(addr); + ok(encoded != addr, "got %p\n", encoded); + todo_wine ok(encoded1 != encoded, "got %p\n", encoded1); + + decoded = pRtlDecodeSystemPointer(encoded1); + ok(decoded == addr, "got %p\n", decoded); + + our_encoded = our_encode_pointer(addr, system_cookie); + todo_wine ok(encoded1 == our_encoded || broken(encoded1 == (void*)((uintptr_t)addr ^ (uintptr_t)system_cookie)), "got %p (ours %p)\n", encoded1, our_encoded); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -3523,4 +3605,5 @@ START_TEST(rtl) test_LdrEnumerateLoadedModules(); test_RtlMakeSelfRelativeSD(); test_LdrRegisterDllNotification(); + test_RtlEncodePointer(); } -- 2.28.0

1 1

[PATCH 1/2] include: Add _rot[rl]64.
by Myah Caron 08 Oct '20

08 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- include/msvcrt/stdlib.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 00acd374346..c3dac816f59 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -169,7 +169,9 @@ size_t __cdecl _mbstrlen(const char*); _onexit_t __cdecl _onexit(_onexit_t); int __cdecl _putenv(const char*); unsigned int __cdecl _rotl(unsigned int,int); +unsigned __int64 __cdecl _rotl64(unsigned __int64,int); unsigned int __cdecl _rotr(unsigned int,int); +unsigned __int64 __cdecl _rotr64(unsigned __int64,int); void __cdecl _searchenv(const char*,const char*,char*); int __cdecl _set_error_mode(int); void __cdecl _seterrormode(int); -- 2.28.0

1 0

[PATCH v2 2/2] msado15: Implement _Connection get/put Mode
by Hans Leidekker 08 Oct '20

08 Oct '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: Initialize mode with a different value in the test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/connection.c | 18 ++++++++++++++---- dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 499f8b22563..357834a95fe 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -54,6 +54,7 @@ struct connection LONG timeout; WCHAR *datasource; WCHAR *provider; + ConnectModeEnum mode; struct connection_point cp_connev; }; @@ -336,14 +337,22 @@ static HRESULT WINAPI connection_put_CursorLocation( _Connection *iface, CursorL static HRESULT WINAPI connection_get_Mode( _Connection *iface, ConnectModeEnum *mode ) { - FIXME( "%p, %p\n", iface, mode ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %p\n", iface, mode ); + + *mode = connection->mode; + return S_OK; } static HRESULT WINAPI connection_put_Mode( _Connection *iface, ConnectModeEnum mode ) { - FIXME( "%p, %u\n", iface, mode ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %u\n", iface, mode ); + + connection->mode = mode; + return S_OK; } static HRESULT WINAPI connection_get_Provider( _Connection *iface, BSTR *str ) @@ -664,6 +673,7 @@ HRESULT Connection_create( void **obj ) connection->timeout = 30; connection->datasource = NULL; connection->provider = SysAllocString(L"MSDASQL"); + connection->mode = adModeUnknown; connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index bedca96368d..8e8553c3b8d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -675,6 +675,7 @@ static void test_Connection(void) IConnectionPointContainer *pointcontainer; LONG state, timeout; BSTR str, str2, str3; + ConnectModeEnum mode; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -718,6 +719,22 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + mode = 0xdeadbeef; + hr = _Connection_get_Mode(connection, &mode); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(mode == adModeUnknown, "Unexpected mode value %d\n", mode); + + hr = _Connection_put_Mode(connection, adModeShareDenyNone); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + + mode = adModeUnknown; + hr = _Connection_get_Mode(connection, &mode); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(mode == adModeShareDenyNone, "Unexpected mode value %d\n", mode); + + hr = _Connection_put_Mode(connection, adModeUnknown); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + /* Default */ str = (BSTR)0xdeadbeef; hr = _Connection_get_Provider(connection, &str); -- 2.28.0

1 0

[PATCH v2 1/2] msado15: Implement _Connection Get/Put Provider
by Hans Leidekker 08 Oct '20

08 Oct '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: Remove redundant NULL check. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/connection.c | 26 +++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 37 +++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 5d8f78f53e8..499f8b22563 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -53,6 +53,7 @@ struct connection ObjectStateEnum state; LONG timeout; WCHAR *datasource; + WCHAR *provider; struct connection_point cp_connev; }; @@ -96,6 +97,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) IUnknown_Release( connection->cp_connev.sinks[i] ); } heap_free( connection->cp_connev.sinks ); + heap_free( connection->provider ); heap_free( connection->datasource ); heap_free( connection ); } @@ -346,14 +348,29 @@ static HRESULT WINAPI connection_put_Mode( _Connection *iface, ConnectModeEnum m static HRESULT WINAPI connection_get_Provider( _Connection *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + BSTR provider = NULL; + + TRACE( "%p, %p\n", iface, str ); + + if (connection->provider && !(provider = SysAllocString( connection->provider ))) return E_OUTOFMEMORY; + *str = provider; + return S_OK; } static HRESULT WINAPI connection_put_Provider( _Connection *iface, BSTR str ) { - FIXME( "%p, %s\n", iface, debugstr_w(str) ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + WCHAR *provider = NULL; + + TRACE( "%p, %s\n", iface, debugstr_w(str) ); + + if (!str) return MAKE_ADO_HRESULT(adErrInvalidArgument); + + if (!(provider = strdupW( str ))) return E_OUTOFMEMORY; + heap_free( connection->provider ); + connection->provider = provider; + return S_OK; } static HRESULT WINAPI connection_get_State( _Connection *iface, LONG *state ) @@ -646,6 +663,7 @@ HRESULT Connection_create( void **obj ) connection->state = adStateClosed; connection->timeout = 30; connection->datasource = NULL; + connection->provider = SysAllocString(L"MSDASQL"); connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 1629fe15bed..bedca96368d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -718,15 +718,50 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + /* Default */ str = (BSTR)0xdeadbeef; - hr = _Connection_get_ConnectionString(connection, &str); + hr = _Connection_get_Provider(connection, &str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(!wcscmp(str, L"MSDASQL"), "wrong string %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"MSDASQL.1"); + hr = _Connection_put_Provider(connection, str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + SysFreeString(str); + + str = (BSTR)0xdeadbeef; + hr = _Connection_get_Provider(connection, &str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(!wcscmp(str, L"MSDASQL.1"), "wrong string %s\n", wine_dbgstr_w(str)); + + /* Restore default */ + str = SysAllocString(L"MSDASQL"); + hr = _Connection_put_Provider(connection, str); ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + SysFreeString(str); + + hr = _Connection_put_Provider(connection, NULL); + ok(hr == MAKE_ADO_HRESULT(adErrInvalidArgument), "got 0x%08x\n", hr); + SysFreeString(str); + + str = (BSTR)0xdeadbeef; + hr = _Connection_get_ConnectionString(connection, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(str == NULL, "got %p\n", str); str = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); hr = _Connection_put_ConnectionString(connection, str); ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + /* Show put_ConnectionString effects Provider */ + str3 = (BSTR)0xdeadbeef; + hr = _Connection_get_Provider(connection, &str3); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(str3 != NULL, "Expected value got NULL\n"); + todo_wine ok(!wcscmp(str3, L"MSDASQL.1"), "wrong string %s\n", wine_dbgstr_w(str3)); + SysFreeString(str3); + if (0) /* Crashes on windows */ { hr = _Connection_get_ConnectionString(connection, NULL); -- 2.28.0

1 0

[PATCH 1/6] mf/evr: Partially implement InitializeRenderer().
by Nikolay Sivov 08 Oct '20

08 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 333 +++++++++++++++++++++++++++------------------ dlls/mf/tests/mf.c | 8 +- 2 files changed, 208 insertions(+), 133 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index c5b2ceecd67..e90cf686f26 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -854,12 +854,195 @@ static ULONG WINAPI video_renderer_Release(IMFVideoRenderer *iface) return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); } +static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) +{ + unsigned int flags = 0; + IMFActivate *activate; + CLSID clsid; + HRESULT hr; + + if (attributes && SUCCEEDED(hr = IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE, + &IID_IMFActivate, (void **)&activate))) + { + IMFAttributes_GetUINT32(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS, &flags); + hr = IMFActivate_ActivateObject(activate, &IID_IMFTransform, (void **)out); + IMFActivate_Release(activate); + if (SUCCEEDED(hr) || !(flags & MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL)) + return hr; + } + + if (!attributes || FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, &clsid))) + memcpy(&clsid, &CLSID_MFVideoMixer9, sizeof(clsid)); + + return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out); +} + +static HRESULT video_renderer_create_presenter(IMFAttributes *attributes, IMFVideoPresenter **out) +{ + unsigned int flags = 0; + IMFActivate *activate; + CLSID clsid; + HRESULT hr; + + if (attributes && SUCCEEDED(IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, + &IID_IMFActivate, (void **)&activate))) + { + IMFAttributes_GetUINT32(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, &flags); + hr = IMFActivate_ActivateObject(activate, &IID_IMFVideoPresenter, (void **)out); + IMFActivate_Release(activate); + if (SUCCEEDED(hr) || !(flags & MF_ACTIVATE_CUSTOM_PRESENTER_ALLOWFAIL)) + return hr; + } + + if (!attributes || FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID, &clsid))) + memcpy(&clsid, &CLSID_MFVideoPresenter9, sizeof(clsid)); + + return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFVideoPresenter, (void **)out); +} + +static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) +{ + IMFTopologyServiceLookupClient *lookup_client; + HRESULT hr; + + if (SUCCEEDED(hr = IMFTransform_QueryInterface(renderer->mixer, &IID_IMFTopologyServiceLookupClient, + (void **)&lookup_client))) + { + renderer->flags |= EVR_INIT_SERVICES; + if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, + &renderer->IMFTopologyServiceLookup_iface))) + { + renderer->flags |= EVR_MIXER_INITED_SERVICES; + } + renderer->flags &= ~EVR_INIT_SERVICES; + IMFTopologyServiceLookupClient_Release(lookup_client); + } + + if (SUCCEEDED(hr)) + { + unsigned int input_count, output_count; + unsigned int *ids, *oids; + size_t i; + + /* Create stream sinks for inputs that mixer already has by default. */ + if (SUCCEEDED(IMFTransform_GetStreamCount(renderer->mixer, &input_count, &output_count))) + { + ids = heap_calloc(input_count, sizeof(*ids)); + oids = heap_calloc(output_count, sizeof(*oids)); + + if (ids && oids) + { + if (SUCCEEDED(IMFTransform_GetStreamIDs(renderer->mixer, input_count, ids, output_count, oids))) + { + for (i = 0; i < input_count; ++i) + { + video_renderer_add_stream(renderer, ids[i], NULL); + } + } + + } + + heap_free(ids); + heap_free(oids); + } + } + + return hr; +} + +static HRESULT video_renderer_configure_presenter(struct video_renderer *renderer) +{ + IMFTopologyServiceLookupClient *lookup_client; + HRESULT hr; + + if (SUCCEEDED(hr = IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFTopologyServiceLookupClient, + (void **)&lookup_client))) + { + renderer->flags |= EVR_INIT_SERVICES; + if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, + &renderer->IMFTopologyServiceLookup_iface))) + { + renderer->flags |= EVR_PRESENTER_INITED_SERVICES; + } + renderer->flags &= ~EVR_INIT_SERVICES; + IMFTopologyServiceLookupClient_Release(lookup_client); + } + + return hr; +} + +static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTransform *mixer, + IMFVideoPresenter *presenter) +{ + HRESULT hr; + + if (renderer->mixer) + { + IMFTransform_Release(renderer->mixer); + renderer->mixer = NULL; + } + + if (renderer->presenter) + { + IMFVideoPresenter_Release(renderer->presenter); + renderer->presenter = NULL; + } + + renderer->mixer = mixer; + IMFTransform_AddRef(renderer->mixer); + + renderer->presenter = presenter; + IMFVideoPresenter_AddRef(renderer->presenter); + + if (SUCCEEDED(hr = video_renderer_configure_mixer(renderer))) + hr = video_renderer_configure_presenter(renderer); + + return hr; +} + static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, IMFTransform *mixer, IMFVideoPresenter *presenter) { - FIXME("%p, %p, %p.\n", iface, mixer, presenter); + struct video_renderer *renderer = impl_from_IMFVideoRenderer(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, mixer, presenter); + + if (mixer) + IMFTransform_AddRef(mixer); + else if (FAILED(hr = video_renderer_create_mixer(NULL, &mixer))) + { + WARN("Failed to create default mixer object, hr %#x.\n", hr); + return hr; + } + + if (presenter) + IMFVideoPresenter_AddRef(presenter); + else if (FAILED(hr = video_renderer_create_presenter(NULL, &presenter))) + { + WARN("Failed to create default presenter, hr %#x.\n", hr); + IMFTransform_Release(mixer); + return hr; + } + + EnterCriticalSection(&renderer->cs); + + if (renderer->flags & EVR_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + { + /* FIXME: check clock state */ + /* FIXME: check that streams are not initialized */ + + hr = video_renderer_initialize(renderer, mixer, presenter); + } + + LeaveCriticalSection(&renderer->cs); + + IMFTransform_Release(mixer); + IMFVideoPresenter_Release(presenter); + + return hr; } static const IMFVideoRendererVtbl video_renderer_vtbl = @@ -1191,128 +1374,11 @@ static const IMediaEventSinkVtbl media_event_sink_vtbl = video_renderer_event_sink_Notify, }; -static HRESULT video_renderer_create_mixer(struct video_renderer *renderer, IMFAttributes *attributes, - IMFTransform **out) -{ - IMFTopologyServiceLookupClient *lookup_client; - unsigned int flags = 0; - IMFActivate *activate; - CLSID clsid; - HRESULT hr; - - if (SUCCEEDED(hr = IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE, - &IID_IMFActivate, (void **)&activate))) - { - IMFAttributes_GetUINT32(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS, &flags); - hr = IMFActivate_ActivateObject(activate, &IID_IMFTransform, (void **)out); - IMFActivate_Release(activate); - if (FAILED(hr) && !(flags & MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL)) - return hr; - } - - /* Activation object failed, use class activation. */ - if (FAILED(hr)) - { - if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, &clsid))) - memcpy(&clsid, &CLSID_MFVideoMixer9, sizeof(clsid)); - hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out); - } - - if (FAILED(hr)) - { - WARN("Failed to create a mixer object, hr %#x.\n", hr); - return hr; - } - - if (SUCCEEDED(hr = IMFTransform_QueryInterface(*out, &IID_IMFTopologyServiceLookupClient, - (void **)&lookup_client))) - { - renderer->flags |= EVR_INIT_SERVICES; - if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, - &renderer->IMFTopologyServiceLookup_iface))) - { - renderer->flags |= EVR_MIXER_INITED_SERVICES; - } - renderer->flags &= ~EVR_INIT_SERVICES; - IMFTopologyServiceLookupClient_Release(lookup_client); - } - - if (SUCCEEDED(hr)) - { - unsigned int input_count, output_count; - unsigned int *ids, *oids; - size_t i; - - /* Create stream sinks for inputs that mixer already has by default. */ - if (SUCCEEDED(IMFTransform_GetStreamCount(*out, &input_count, &output_count))) - { - ids = heap_calloc(input_count, sizeof(*ids)); - oids = heap_calloc(output_count, sizeof(*oids)); - - if (ids && oids) - { - if (SUCCEEDED(IMFTransform_GetStreamIDs(*out, input_count, ids, output_count, oids))) - { - for (i = 0; i < input_count; ++i) - { - video_renderer_add_stream(renderer, ids[i], NULL); - } - } - - } - - heap_free(ids); - heap_free(oids); - } - } - - return hr; -} - -static HRESULT video_renderer_create_presenter(struct video_renderer *renderer, IMFAttributes *attributes, - IMFVideoPresenter **out) -{ - IMFTopologyServiceLookupClient *lookup_client; - unsigned int flags = 0; - IMFActivate *activate; - CLSID clsid; - HRESULT hr; - - if (SUCCEEDED(IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, - &IID_IMFActivate, (void **)&activate))) - { - IMFAttributes_GetUINT32(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, &flags); - hr = IMFActivate_ActivateObject(activate, &IID_IMFVideoPresenter, (void **)out); - IMFActivate_Release(activate); - if (FAILED(hr) && !(flags & MF_ACTIVATE_CUSTOM_PRESENTER_ALLOWFAIL)) - return hr; - } - - if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID, &clsid))) - memcpy(&clsid, &CLSID_MFVideoPresenter9, sizeof(clsid)); - - if (SUCCEEDED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFVideoPresenter, (void **)out))) - { - if (SUCCEEDED(hr = IMFVideoPresenter_QueryInterface(*out, &IID_IMFTopologyServiceLookupClient, - (void **)&lookup_client))) - { - renderer->flags |= EVR_INIT_SERVICES; - if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, - &renderer->IMFTopologyServiceLookup_iface))) - { - renderer->flags |= EVR_PRESENTER_INITED_SERVICES; - } - renderer->flags &= ~EVR_INIT_SERVICES; - IMFTopologyServiceLookupClient_Release(lookup_client); - } - } - - return hr; -} - static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct video_renderer *object; + IMFVideoPresenter *presenter; + IMFTransform *mixer; HRESULT hr; TRACE("%p, %p, %p.\n", attributes, user_context, obj); @@ -1335,18 +1401,30 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, goto failed; /* Create mixer and presenter. */ - if (FAILED(hr = video_renderer_create_mixer(object, attributes, &object->mixer))) + if (FAILED(hr = video_renderer_create_mixer(attributes, &mixer))) + goto failed; + + if (FAILED(hr = video_renderer_create_presenter(attributes, &presenter))) goto failed; - if (FAILED(hr = video_renderer_create_presenter(object, attributes, &object->presenter))) + if (FAILED(hr = video_renderer_initialize(object, mixer, presenter))) goto failed; + IMFTransform_Release(mixer); + IMFVideoPresenter_Release(presenter); + *obj = (IUnknown *)&object->IMFMediaSink_iface; return S_OK; failed: + if (mixer) + IMFTransform_Release(mixer); + + if (presenter) + IMFVideoPresenter_Release(presenter); + video_renderer_release_services(object); IMFMediaSink_Release(&object->IMFMediaSink_iface); @@ -1394,7 +1472,6 @@ HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) */ HRESULT WINAPI MFCreateVideoRenderer(REFIID riid, void **renderer) { - IMFAttributes *attributes; IUnknown *obj; HRESULT hr; @@ -1402,13 +1479,7 @@ HRESULT WINAPI MFCreateVideoRenderer(REFIID riid, void **renderer) *renderer = NULL; - if (FAILED(hr = MFCreateAttributes(&attributes, 0))) - return hr; - - hr = evr_create_object(attributes, NULL, &obj); - IMFAttributes_Release(attributes); - - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr = evr_create_object(NULL, NULL, &obj))) { hr = IUnknown_QueryInterface(obj, riid, renderer); IUnknown_Release(obj); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0bc297cc69c..88cfa8d7625 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3253,9 +3253,13 @@ static void test_evr(void) hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); - hr = MFCreateVideoRenderer(&IID_IUnknown, (void **)&unk); + hr = MFCreateVideoRenderer(&IID_IMFVideoRenderer, (void **)&video_renderer); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + + hr = IMFVideoRenderer_InitializeRenderer(video_renderer, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFVideoRenderer_Release(video_renderer); hr = MFCreateVideoRendererActivate(NULL, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); -- 2.28.0

1 5

[PATCH] msvcp110/tests: Use wide-char string literals.
by Michael Stefaniuc 08 Oct '20

08 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp110/tests/msvcp110.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/tests/msvcp110.c b/dlls/msvcp110/tests/msvcp110.c index 550246a7f23..8491e292d58 100644 --- a/dlls/msvcp110/tests/msvcp110.c +++ b/dlls/msvcp110/tests/msvcp110.c @@ -84,8 +84,6 @@ static void test_tr2_sys__Last_write_time(void) HANDLE file; int ret; FILETIME lwt; - static const WCHAR fileW[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','1',0}; - static const WCHAR not_existW[] = {'n','o','t','_','e','x','i','s','t',0}; __int64 last_write_time, newtime, margin_of_error = 10 * TICKSPERSEC; ret = p_tr2_sys__Make_dir("tr2_test_dir"); ok(ret == 1, "test_tr2_sys__Make_dir(): expect 1 got %d\n", ret); @@ -100,7 +98,7 @@ static void test_tr2_sys__Last_write_time(void) ok(last_write_time != newtime, "last_write_time should have changed: %s\n", wine_dbgstr_longlong(last_write_time)); - last_write_time = p_tr2_sys__Last_write_time_wchar(fileW); + last_write_time = p_tr2_sys__Last_write_time_wchar(L"tr2_test_dir/f1"); ok(last_write_time == newtime, "last_write_time and last_write_time_wchar returned different times (%s != %s)\n", wine_dbgstr_longlong(last_write_time), wine_dbgstr_longlong(newtime)); @@ -132,7 +130,7 @@ static void test_tr2_sys__Last_write_time(void) "don't fit the formula, last_write_time is %s\n", wine_dbgstr_longlong(last_write_time)); newtime = 123456789; - p_tr2_sys__Last_write_time_set_wchar(fileW, newtime); + p_tr2_sys__Last_write_time_set_wchar(L"tr2_test_dir/f1", newtime); newtime = p_tr2_sys__Last_write_time("tr2_test_dir/f1"); file = CreateFileA("tr2_test_dir/f1", 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); @@ -149,7 +147,7 @@ static void test_tr2_sys__Last_write_time(void) last_write_time = p_tr2_sys__Last_write_time("not_exist"); ok(errno == 0xdeadbeef, "tr2_sys__Last_write_time(): errno expect 0xdeadbeef, got %d\n", errno); ok(last_write_time == 0, "expect 0 got %s\n", wine_dbgstr_longlong(last_write_time)); - last_write_time = p_tr2_sys__Last_write_time_wchar(not_existW); + last_write_time = p_tr2_sys__Last_write_time_wchar(L"not_exist"); ok(errno == 0xdeadbeef, "tr2_sys__Last_write_time_wchar(): errno expect 0xdeadbeef, got %d\n", errno); ok(last_write_time == 0, "expect 0 got %s\n", wine_dbgstr_longlong(last_write_time)); last_write_time = p_tr2_sys__Last_write_time(NULL); @@ -160,7 +158,7 @@ static void test_tr2_sys__Last_write_time(void) errno = 0xdeadbeef; p_tr2_sys__Last_write_time_set("not_exist", newtime); ok(errno == 0xdeadbeef, "tr2_sys__Last_write_time(): errno expect 0xdeadbeef, got %d\n", errno); - p_tr2_sys__Last_write_time_set_wchar(not_existW, newtime); + p_tr2_sys__Last_write_time_set_wchar(L"not_exist", newtime); ok(errno == 0xdeadbeef, "tr2_sys__Last_write_time(): errno expect 0xdeadbeef, got %d\n", errno); p_tr2_sys__Last_write_time_set(NULL, newtime); ok(errno == 0xdeadbeef, "tr2_sys__Last_write_time(): errno expect 0xdeadbeef, got %d\n", errno); -- 2.26.2

2 1

[PATCH v2] regsvr32: Use wide-char string literals.
by Michael Stefaniuc 08 Oct '20

08 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Fix a '\' getting lost in the search&replace of exe_name. Thanks to Stefan for noticing it. programs/regsvr32/regsvr32.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 730f1fef3dd..885f0ff7833 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -114,9 +114,7 @@ static LPCWSTR find_arg_start(LPCWSTR cmdline) static void reexec_self(void) { /* restart current process as 32-bit or 64-bit with same command line */ - static const WCHAR exe_name[] = {'\\','r','e','g','s','v','r','3','2','.','e','x','e',0}; #ifndef _WIN64 - static const WCHAR sysnative[] = {'\\','S','y','s','N','a','t','i','v','e',0}; BOOL wow64; #endif WCHAR systemdir[MAX_PATH]; @@ -138,16 +136,16 @@ static void reexec_self(void) } GetWindowsDirectoryW(systemdir, MAX_PATH); - wcscat(systemdir, sysnative); + wcscat(systemdir, L"\\SysNative"); #endif args = find_arg_start(GetCommandLineW()); cmdline = HeapAlloc(GetProcessHeap(), 0, - (wcslen(systemdir)+wcslen(exe_name)+wcslen(args)+1)*sizeof(WCHAR)); + (wcslen(systemdir)+wcslen(L"\\regsvr32.exe")+wcslen(args)+1)*sizeof(WCHAR)); wcscpy(cmdline, systemdir); - wcscat(cmdline, exe_name); + wcscat(cmdline, L"\\regsvr32.exe"); wcscat(cmdline, args); si.cb = sizeof(si); -- 2.25.4

1 0

[PATCH 5/5] riched20: Pass a ME_Paragraph ptr to shape_para().
by Huw Davies 08 Oct '20

08 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/wrap.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 48db31f4ff2..4853eefcabb 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -795,21 +795,17 @@ end: } -static HRESULT shape_para( ME_Context *c, ME_DisplayItem *p ) +static HRESULT shape_para( ME_Context *c, ME_Paragraph *para ) { - ME_DisplayItem *di; ME_Run *run; HRESULT hr; - for (di = p->next; di != p->member.para.next_para; di = di->next) + for (run = para_first_run( para ); run; run = run_next( run )) { - if (di->type != diRun) continue; - run = &di->member.run; - hr = shape_run( c, run ); if (FAILED( hr )) { - run->para->nFlags &= ~MEPF_COMPLEX; + para->nFlags &= ~MEPF_COMPLEX; return hr; } } @@ -835,7 +831,7 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag ScriptIsComplex( tp->member.para.text->szData, tp->member.para.text->nLen, SIC_COMPLEX ) == S_OK */) { if (SUCCEEDED( itemize_para( c, para ) )) - shape_para( c, para_get_di( para ) ); + shape_para( c, para ); } wc.context = c; -- 2.23.0

1 0

[PATCH 4/5] riched20: Pass a ME_Paragraph ptr to itemize_para().
by Huw Davies 08 Oct '20

08 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 1 + dlls/riched20/para.c | 13 +++++++++++++ dlls/riched20/wrap.c | 29 ++++++++--------------------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 922a1e5c6c2..47e822c2d34 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -211,6 +211,7 @@ int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; void mark_para_rewrap(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; +ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; static inline ME_DisplayItem *para_get_di(ME_Paragraph *para) { return (ME_DisplayItem *)((ptrdiff_t)para - offsetof(ME_DisplayItem, member)); diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 7cef6ca9932..fb994506bea 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -143,6 +143,19 @@ void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) } } +ME_Run *para_first_run( ME_Paragraph *para ) +{ + ME_DisplayItem *di; + + for (di = para_get_di( para ); di != para->next_para; di = di->next ) + { + if (di->type != diRun) continue; + return &di->member.run; + } + ERR( "failed to find run in paragraph\n" ); + return NULL; +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { static const WCHAR cr_lf[] = {'\r','\n',0}; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 13a54829b2b..48db31f4ff2 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -719,11 +719,9 @@ static void ME_PrepareParagraphForWrapping( ME_TextEditor *editor, ME_Context *c } } -static HRESULT itemize_para( ME_Context *c, ME_DisplayItem *p ) +static HRESULT itemize_para( ME_Context *c, ME_Paragraph *para ) { - ME_Paragraph *para = &p->member.para; ME_Run *run; - ME_DisplayItem *di; SCRIPT_ITEM buf[16], *items = buf; int items_passed = ARRAY_SIZE( buf ), num_items, cur_item; SCRIPT_CONTROL control = { LANG_USER_DEFAULT, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, @@ -731,8 +729,6 @@ static HRESULT itemize_para( ME_Context *c, ME_DisplayItem *p ) SCRIPT_STATE state = { 0, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 0, 0 }; HRESULT hr; - assert( p->type == diParagraph ); - if (para->fmt.dwMask & PFM_RTLPARA && para->fmt.wEffects & PFE_RTLPARA) state.uBidiLevel = 1; @@ -763,19 +759,13 @@ static HRESULT itemize_para( ME_Context *c, ME_DisplayItem *p ) } TRACE( "before splitting runs into ranges\n" ); - for (di = p->next; di != p->member.para.next_para; di = di->next) - { - if (di->type != diRun) continue; - TRACE( "\t%d: %s\n", di->member.run.nCharOfs, debugstr_run( &di->member.run ) ); - } + for (run = para_first_run( para ); run; run = run_next( run )) + TRACE( "\t%d: %s\n", run->nCharOfs, debugstr_run( run ) ); } /* split runs into ranges at item boundaries */ - for (di = p->next, cur_item = 0; di != p->member.para.next_para; di = di->next) + for (run = para_first_run( para ), cur_item = 0; run; run = run_next( run )) { - if (di->type != diRun) continue; - run = &di->member.run; - if (run->nCharOfs == items[cur_item+1].iCharPos) cur_item++; items[cur_item].a.fLogicalOrder = TRUE; @@ -785,7 +775,7 @@ static HRESULT itemize_para( ME_Context *c, ME_DisplayItem *p ) if (run->nCharOfs + run->len > items[cur_item+1].iCharPos) { - ME_Cursor cursor = {p, di, items[cur_item+1].iCharPos - run->nCharOfs}; + ME_Cursor cursor = {para_get_di( para ), run_get_di( run ), items[cur_item+1].iCharPos - run->nCharOfs}; ME_SplitRunSimple( c->editor, &cursor ); } } @@ -793,11 +783,8 @@ static HRESULT itemize_para( ME_Context *c, ME_DisplayItem *p ) if (TRACE_ON( richedit )) { TRACE( "after splitting into ranges\n" ); - for (di = p->next; di != p->member.para.next_para; di = di->next) - { - if (di->type != diRun) continue; - TRACE( "\t%d: %s\n", di->member.run.nCharOfs, debugstr_run( &di->member.run ) ); - } + for (run = para_first_run( para ); run; run = run_next( run )) + TRACE( "\t%d: %s\n", run->nCharOfs, debugstr_run( run ) ); } para->nFlags |= MEPF_COMPLEX; @@ -847,7 +834,7 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag if (!c->editor->cPasswordMask /* && ScriptIsComplex( tp->member.para.text->szData, tp->member.para.text->nLen, SIC_COMPLEX ) == S_OK */) { - if (SUCCEEDED( itemize_para( c, para_get_di( para ) ) )) + if (SUCCEEDED( itemize_para( c, para ) )) shape_para( c, para_get_di( para ) ); } -- 2.23.0

1 0

[PATCH 3/5] riched20: Pass a ME_Paragraph ptr to WrapTextParagraph().
by Huw Davies 08 Oct '20

08 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/wrap.c | 150 +++++++++++++++++++++---------------------- 1 file changed, 73 insertions(+), 77 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index c74931015a1..13a54829b2b 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -687,32 +687,36 @@ static int ME_GetParaLineSpace(ME_Context* c, ME_Paragraph* para) return sp * c->editor->nZoomNumerator / c->editor->nZoomDenominator; } -static void ME_PrepareParagraphForWrapping(ME_TextEditor *editor, ME_Context *c, ME_DisplayItem *tp) { - ME_DisplayItem *p; - - tp->member.para.nWidth = 0; - /* remove row start items as they will be reinserted by the - * paragraph wrapper anyway */ - editor->total_rows -= tp->member.para.nRows; - tp->member.para.nRows = 0; - for (p = tp->next; p != tp->member.para.next_para; p = p->next) { - if (p->type == diStartRow) { - ME_DisplayItem *pRow = p; - p = p->prev; - ME_Remove(pRow); - ME_DestroyDisplayItem(pRow); +static void ME_PrepareParagraphForWrapping( ME_TextEditor *editor, ME_Context *c, ME_Paragraph *para ) +{ + ME_DisplayItem *p; + + para->nWidth = 0; + /* remove row start items as they will be reinserted by the + * paragraph wrapper anyway */ + editor->total_rows -= para->nRows; + para->nRows = 0; + for (p = para_get_di( para ); p != para->next_para; p = p->next) + { + if (p->type == diStartRow) + { + ME_DisplayItem *pRow = p; + p = p->prev; + ME_Remove( pRow ); + ME_DestroyDisplayItem( pRow ); + } } - } - /* join runs that can be joined */ - for (p = tp->next; p != tp->member.para.next_para; p = p->next) { - assert(p->type != diStartRow); /* should have been deleted above */ - if (p->type == diRun) { - while (p->next->type == diRun && /* FIXME */ - ME_CanJoinRuns(&p->member.run, &p->next->member.run)) { - ME_JoinRuns(c->editor, p); - } + + /* join runs that can be joined */ + for (p = para_get_di( para )->next; p != para->next_para; p = p->next) + { + assert(p->type != diStartRow); /* should have been deleted above */ + if (p->type == diRun) + { + while (p->next->type == diRun && ME_CanJoinRuns( &p->member.run, &p->next->member.run )) + ME_JoinRuns( c->editor, p ); + } } - } } static HRESULT itemize_para( ME_Context *c, ME_DisplayItem *p ) @@ -825,103 +829,95 @@ static HRESULT shape_para( ME_Context *c, ME_DisplayItem *p ) return hr; } -static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_DisplayItem *tp ) +static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Paragraph *para ) { ME_Run *run; ME_WrapContext wc; int border = 0; int linespace = 0; - PARAFORMAT2 *pFmt; - assert(tp->type == diParagraph); - if (!(tp->member.para.nFlags & MEPF_REWRAP)) { - return; - } - ME_PrepareParagraphForWrapping(editor, c, tp); + if (!(para->nFlags & MEPF_REWRAP)) return; + + ME_PrepareParagraphForWrapping( editor, c, para ); /* Calculate paragraph numbering label */ - para_num_init( c, &tp->member.para ); + para_num_init( c, para ); /* For now treating all non-password text as complex for better testing */ if (!c->editor->cPasswordMask /* && ScriptIsComplex( tp->member.para.text->szData, tp->member.para.text->nLen, SIC_COMPLEX ) == S_OK */) { - if (SUCCEEDED( itemize_para( c, tp ) )) - shape_para( c, tp ); + if (SUCCEEDED( itemize_para( c, para_get_di( para ) ) )) + shape_para( c, para_get_di( para ) ); } - pFmt = &tp->member.para.fmt; - wc.context = c; - wc.para = &tp->member.para; -/* wc.para_style = tp->member.para.style; */ + wc.para = para; wc.style = NULL; wc.nParaNumOffset = 0; - if (tp->member.para.nFlags & MEPF_ROWEND) { + if (para->nFlags & MEPF_ROWEND) wc.nFirstMargin = wc.nLeftMargin = wc.nRightMargin = 0; - } else { - int dxStartIndent = pFmt->dxStartIndent; - if (tp->member.para.pCell) { - dxStartIndent += ME_GetTableRowEnd(tp)->member.para.fmt.dxOffset; - } - wc.nLeftMargin = ME_twips2pointsX(c, dxStartIndent + pFmt->dxOffset); - wc.nFirstMargin = ME_twips2pointsX(c, dxStartIndent); - if (pFmt->wNumbering) + else + { + int dxStartIndent = para->fmt.dxStartIndent; + if (para->pCell) + dxStartIndent += ME_GetTableRowEnd( para_get_di( para ) )->member.para.fmt.dxOffset; + + wc.nLeftMargin = ME_twips2pointsX( c, dxStartIndent + para->fmt.dxOffset ); + wc.nFirstMargin = ME_twips2pointsX( c, dxStartIndent ); + if (para->fmt.wNumbering) { wc.nParaNumOffset = wc.nFirstMargin; - dxStartIndent = max( ME_twips2pointsX(c, pFmt->wNumberingTab), - tp->member.para.para_num.width ); + dxStartIndent = max( ME_twips2pointsX(c, para->fmt.wNumberingTab), + para->para_num.width ); wc.nFirstMargin += dxStartIndent; } - wc.nRightMargin = ME_twips2pointsX(c, pFmt->dxRightIndent); + wc.nRightMargin = ME_twips2pointsX( c, para->fmt.dxRightIndent ); - if (wc.nFirstMargin < 0) - wc.nFirstMargin = 0; - if (wc.nLeftMargin < 0) - wc.nLeftMargin = 0; + if (wc.nFirstMargin < 0) wc.nFirstMargin = 0; + if (wc.nLeftMargin < 0) wc.nLeftMargin = 0; } if (c->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ - pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) + para->fmt.dwMask & PFM_TABLE && para->fmt.wEffects & PFE_TABLE) { - wc.nFirstMargin += ME_twips2pointsX(c, pFmt->dxOffset * 2); + wc.nFirstMargin += ME_twips2pointsX( c, para->fmt.dxOffset * 2 ); } wc.nRow = 0; wc.pt.y = 0; - if (pFmt->dwMask & PFM_SPACEBEFORE) - wc.pt.y += ME_twips2pointsY(c, pFmt->dySpaceBefore); - if (!(pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) && - pFmt->dwMask & PFM_BORDER) + if (para->fmt.dwMask & PFM_SPACEBEFORE) + wc.pt.y += ME_twips2pointsY( c, para->fmt.dySpaceBefore ); + if (!(para->fmt.dwMask & PFM_TABLE && para->fmt.wEffects & PFE_TABLE) && + para->fmt.dwMask & PFM_BORDER) { - border = ME_GetParaBorderWidth(c, tp->member.para.fmt.wBorders); - if (pFmt->wBorders & 1) { + border = ME_GetParaBorderWidth( c, para->fmt.wBorders ); + if (para->fmt.wBorders & 1) + { wc.nFirstMargin += border; wc.nLeftMargin += border; } - if (pFmt->wBorders & 2) - wc.nRightMargin -= border; - if (pFmt->wBorders & 4) - wc.pt.y += border; + if (para->fmt.wBorders & 2) wc.nRightMargin -= border; + if (para->fmt.wBorders & 4) wc.pt.y += border; } - linespace = ME_GetParaLineSpace(c, &tp->member.para); + linespace = ME_GetParaLineSpace( c, para ); - ME_BeginRow(&wc); - run = &ME_FindItemFwd( tp, diRun )->member.run; + ME_BeginRow( &wc ); + run = &ME_FindItemFwd( para_get_di( para ), diRun )->member.run; while (run) { run = ME_WrapHandleRun( &wc, run ); if (wc.nRow && run == wc.pRowStart) wc.pt.y += linespace; } ME_WrapEndParagraph( &wc ); - if (!(pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) && - (pFmt->dwMask & PFM_BORDER) && (pFmt->wBorders & 8)) + if (!(para->fmt.dwMask & PFM_TABLE && para->fmt.wEffects & PFE_TABLE) && + (para->fmt.dwMask & PFM_BORDER) && (para->fmt.wBorders & 8)) wc.pt.y += border; - if (tp->member.para.fmt.dwMask & PFM_SPACEAFTER) - wc.pt.y += ME_twips2pointsY(c, pFmt->dySpaceAfter); + if (para->fmt.dwMask & PFM_SPACEAFTER) + wc.pt.y += ME_twips2pointsY( c, para->fmt.dySpaceAfter ); - tp->member.para.nFlags &= ~MEPF_REWRAP; - tp->member.para.nHeight = wc.pt.y; - tp->member.para.nRows = wc.nRow; + para->nFlags &= ~MEPF_REWRAP; + para->nHeight = wc.pt.y; + para->nRows = wc.nRow; editor->total_rows += wc.nRow; } @@ -1068,7 +1064,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) assert(item->type == diParagraph); prev_width = item->member.para.nWidth; - ME_WrapTextParagraph(editor, &c, item); + ME_WrapTextParagraph( editor, &c, &item->member.para ); if (prev_width == totalWidth && item->member.para.nWidth < totalWidth) totalWidth = get_total_width(editor); else -- 2.23.0

1 0

[PATCH 2/5] riched20: Store a ME_Paragraph ptr in the wrap context.
by Huw Davies 08 Oct '20

08 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 5 +++- dlls/riched20/para.c | 9 ++---- dlls/riched20/run.c | 4 +-- dlls/riched20/wrap.c | 68 +++++++++++++++++++----------------------- 4 files changed, 39 insertions(+), 47 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index c42d3bc5e7c..922a1e5c6c2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -209,9 +209,12 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_num_clear( struct para_num *pn ) DECLSPEC_HIDDEN; int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; void mark_para_rewrap(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; -ME_DisplayItem *get_di_from_para(ME_Paragraph *para) DECLSPEC_HIDDEN; void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; +static inline ME_DisplayItem *para_get_di(ME_Paragraph *para) +{ + return (ME_DisplayItem *)((ptrdiff_t)para - offsetof(ME_DisplayItem, member)); +} /* paint.c */ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index bde0654b666..7cef6ca9932 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -29,11 +29,6 @@ void mark_para_rewrap(ME_TextEditor *editor, ME_DisplayItem *para) add_marked_para(editor, para); } -ME_DisplayItem *get_di_from_para(ME_Paragraph *para) -{ - return (ME_DisplayItem *)((ptrdiff_t)para - offsetof(ME_DisplayItem, member)); -} - static ME_DisplayItem *make_para(ME_TextEditor *editor) { ME_DisplayItem *item = ME_MakeDI(diParagraph); @@ -454,7 +449,7 @@ static void para_num_clear_list( ME_TextEditor *editor, ME_Paragraph *para, cons { do { - mark_para_rewrap(editor, get_di_from_para(para)); + mark_para_rewrap( editor, para_get_di( para ) ); para_num_clear( &para->para_num ); if (para->next_para->type != diParagraph) break; para = &para->next_para->member.para; @@ -529,7 +524,7 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_Paragraph *para, const PA if (memcmp(&copy, &para->fmt, sizeof(PARAFORMAT2))) { - mark_para_rewrap(editor, get_di_from_para(para)); + mark_para_rewrap( editor, para_get_di( para ) ); if (((dwMask & PFM_NUMBERING) && (copy.wNumbering != para->fmt.wNumbering)) || ((dwMask & PFM_NUMBERINGSTART) && (copy.wNumberingStart != para->fmt.wNumberingStart)) || ((dwMask & PFM_NUMBERINGSTYLE) && (copy.wNumberingStyle != para->fmt.wNumberingStyle))) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 66925ca3434..f98288a94a2 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -367,7 +367,7 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, ME_InsertBefore( insert_before, pDI ); TRACE("Shift length:%d\n", len); ME_PropagateCharOffset( insert_before, len ); - mark_para_rewrap(editor, get_di_from_para(insert_before->member.run.para)); + mark_para_rewrap( editor, para_get_di( insert_before->member.run.para ) ); /* Move any cursors that were at the end of the previous run to the end of the inserted run */ prev = ME_FindItemBack( pDI, diRun ); @@ -787,7 +787,7 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C ME_ReleaseStyle(para->para_num.style); para->para_num.style = NULL; } - mark_para_rewrap(editor, get_di_from_para(para)); + mark_para_rewrap( editor, para_get_di( para ) ); } } diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index cde46e2d7cf..c74931015a1 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -43,7 +43,7 @@ typedef struct tagME_WrapContext int nRow; POINT pt; BOOL bOverflown, bWordWrap; - ME_DisplayItem *pPara; + ME_Paragraph *para; ME_Run *pRowStart; ME_Run *pLastSplittableRun; } ME_WrapContext; @@ -131,8 +131,7 @@ static ME_Run *split_run_extents( ME_WrapContext *wc, ME_Run *run, int nVChar ) { ME_TextEditor *editor = wc->context->editor; ME_Run *run2; - ME_Paragraph *para = &wc->pPara->member.para; - ME_Cursor cursor = {wc->pPara, run_get_di( run ), nVChar}; + ME_Cursor cursor = {para_get_di( wc->para ), run_get_di( run ), nVChar}; assert( run->nCharOfs != -1 ); ME_CheckCharOffsets(editor); @@ -147,7 +146,7 @@ static ME_Run *split_run_extents( ME_WrapContext *wc, ME_Run *run, int nVChar ) shape_run( wc->context, run ); shape_run( wc->context, run2 ); - calc_run_extent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); + calc_run_extent(wc->context, wc->para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); run2->pt.x = run->pt.x + run->nWidth; run2->pt.y = run->pt.y; @@ -186,24 +185,23 @@ static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) static void ME_BeginRow(ME_WrapContext *wc) { - PARAFORMAT2 *pFmt; - ME_DisplayItem *para = wc->pPara; - - pFmt = &para->member.para.fmt; wc->pRowStart = NULL; wc->bOverflown = FALSE; wc->pLastSplittableRun = NULL; wc->bWordWrap = wc->context->editor->bWordWrap; - if (para->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND)) { + if (wc->para->nFlags & (MEPF_ROWSTART | MEPF_ROWEND)) + { wc->nAvailWidth = 0; wc->bWordWrap = FALSE; - if (para->member.para.nFlags & MEPF_ROWEND) + if (wc->para->nFlags & MEPF_ROWEND) { - ME_Cell *cell = &ME_FindItemBack(para, diCell)->member.cell; + ME_Cell *cell = &ME_FindItemBack( para_get_di( wc->para ), diCell)->member.cell; cell->nWidth = 0; } - } else if (para->member.para.pCell) { - ME_Cell *cell = &para->member.para.pCell->member.cell; + } + else if (wc->para->pCell) + { + ME_Cell *cell = &wc->para->pCell->member.cell; int width; width = cell->nRightBoundary; @@ -211,7 +209,7 @@ static void ME_BeginRow(ME_WrapContext *wc) width -= cell->prev_cell->member.cell.nRightBoundary; if (!cell->prev_cell) { - int rowIndent = ME_GetTableRowEnd(para)->member.para.fmt.dxStartIndent; + int rowIndent = ME_GetTableRowEnd( para_get_di( wc->para ) )->member.para.fmt.dxStartIndent; width -= rowIndent; } cell->nWidth = max(ME_twips2pointsX(wc->context, width), 0); @@ -225,7 +223,7 @@ static void ME_BeginRow(ME_WrapContext *wc) } wc->pt.x = wc->context->pt.x; if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ - pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) + wc->para->fmt.dwMask & PFM_TABLE && wc->para->fmt.wEffects & PFE_TABLE) /* Shift the text down because of the border. */ wc->pt.y++; } @@ -285,15 +283,14 @@ static void ME_InsertRowStart( ME_WrapContext *wc, ME_Run *last ) { ME_Run *run; ME_DisplayItem *row; - ME_Paragraph *para = &wc->pPara->member.para; BOOL bSkippingSpaces = TRUE; int ascent = 0, descent = 0, width = 0, shift = 0, align = 0; /* Include height of para numbering label */ - if (wc->nRow == 0 && para->fmt.wNumbering) + if (wc->nRow == 0 && wc->para->fmt.wNumbering) { - ascent = para->para_num.style->tm.tmAscent; - descent = para->para_num.style->tm.tmDescent; + ascent = wc->para->para_num.style->tm.tmAscent; + descent = wc->para->para_num.style->tm.tmDescent; } for (run = last; run; run = run_prev( run )) @@ -301,8 +298,8 @@ static void ME_InsertRowStart( ME_WrapContext *wc, ME_Run *last ) /* ENDPARA run shouldn't affect row height, except if it's the only run in the paragraph */ if (run == wc->pRowStart || !(run->nFlags & MERF_ENDPARA)) { - if (run->nAscent>ascent) ascent = run->nAscent; - if (run->nDescent>descent) descent = run->nDescent; + if (run->nAscent > ascent) ascent = run->nAscent; + if (run->nDescent > descent) descent = run->nDescent; if (bSkippingSpaces) { /* Exclude space characters from run width. @@ -328,10 +325,10 @@ static void ME_InsertRowStart( ME_WrapContext *wc, ME_Run *last ) if (run == wc->pRowStart) break; } - para->nWidth = max(para->nWidth, width); + wc->para->nWidth = max( wc->para->nWidth, width ); row = ME_MakeRow( ascent + descent, ascent, width ); if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ - (para->fmt.dwMask & PFM_TABLE) && (para->fmt.wEffects & PFE_TABLE)) + (wc->para->fmt.dwMask & PFM_TABLE) && (wc->para->fmt.wEffects & PFE_TABLE)) { /* The text was shifted down in ME_BeginRow so move the wrap context * back to where it should be. */ @@ -342,12 +339,12 @@ static void ME_InsertRowStart( ME_WrapContext *wc, ME_Run *last ) row->member.row.pt = wc->pt; row->member.row.nLMargin = (!wc->nRow ? wc->nFirstMargin : wc->nLeftMargin); row->member.row.nRMargin = wc->nRightMargin; - assert(para->fmt.dwMask & PFM_ALIGNMENT); - align = para->fmt.wAlignment; + assert(wc->para->fmt.dwMask & PFM_ALIGNMENT); + align = wc->para->fmt.wAlignment; if (align == PFA_CENTER) shift = max((wc->nAvailWidth-width)/2, 0); if (align == PFA_RIGHT) shift = max(wc->nAvailWidth-width, 0); - if (para->nFlags & MEPF_COMPLEX) layout_row( wc->pRowStart, last ); + if (wc->para->nFlags & MEPF_COMPLEX) layout_row( wc->pRowStart, last ); row->member.row.pt.x = row->member.row.nLMargin + shift; @@ -357,10 +354,10 @@ static void ME_InsertRowStart( ME_WrapContext *wc, ME_Run *last ) if (run == last) break; } - if (wc->nRow == 0 && para->fmt.wNumbering) + if (wc->nRow == 0 && wc->para->fmt.wNumbering) { - para->para_num.pt.x = wc->nParaNumOffset + shift; - para->para_num.pt.y = wc->pt.y + row->member.row.nBaseline; + wc->para->para_num.pt.x = wc->nParaNumOffset + shift; + wc->para->para_num.pt.y = wc->pt.y + row->member.row.nBaseline; } ME_InsertBefore( run_get_di( wc->pRowStart ), row ); @@ -371,13 +368,10 @@ static void ME_InsertRowStart( ME_WrapContext *wc, ME_Run *last ) static void ME_WrapEndParagraph( ME_WrapContext *wc ) { - ME_DisplayItem *para = wc->pPara; - PARAFORMAT2 *pFmt = &para->member.para.fmt; - - if (wc->pRowStart) ME_InsertRowStart( wc, para->member.para.eop_run ); + if (wc->pRowStart) ME_InsertRowStart( wc, wc->para->eop_run ); if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ - pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) + wc->para->fmt.dwMask & PFM_TABLE && wc->para->fmt.wEffects & PFE_TABLE) { /* ME_BeginRow was called an extra time for the paragraph, and it shifts the * text down by one pixel for the border, so fix up the wrap context. */ @@ -391,7 +385,7 @@ static void ME_WrapSizeRun( ME_WrapContext *wc, ME_Run *run ) ME_UpdateRunFlags( wc->context->editor, run ); - calc_run_extent( wc->context, &wc->pPara->member.para, + calc_run_extent( wc->context, wc->para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run ); } @@ -576,7 +570,7 @@ static ME_Run *ME_WrapHandleRun( ME_WrapContext *wc, ME_Run *run ) ME_Run *new_run; wc->bOverflown = FALSE; new_run = split_run_extents( wc, run, black ); - calc_run_extent( wc->context, &wc->pPara->member.para, + calc_run_extent( wc->context, wc->para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run ); ME_InsertRowStart( wc, run ); return new_run; @@ -859,7 +853,7 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Displ pFmt = &tp->member.para.fmt; wc.context = c; - wc.pPara = tp; + wc.para = &tp->member.para; /* wc.para_style = tp->member.para.style; */ wc.style = NULL; wc.nParaNumOffset = 0; -- 2.23.0

1 0

[PATCH 1/5] riched20: Move several of the wrapping functions to use ME_Run directly.
by Huw Davies 08 Oct '20

08 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 6 + dlls/riched20/run.c | 20 ++ dlls/riched20/wrap.c | 441 +++++++++++++++++++---------------------- 3 files changed, 231 insertions(+), 236 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 02bff7ccebf..c42d3bc5e7c 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -76,6 +76,8 @@ ME_DisplayItem *ME_MakeDI(ME_DIType type) DECLSPEC_HIDDEN; void ME_DestroyDisplayItem(ME_DisplayItem *item) DECLSPEC_HIDDEN; void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) DECLSPEC_HIDDEN; +ME_Run *run_prev( ME_Run *run ) DECLSPEC_HIDDEN; +ME_Run *run_next( ME_Run *run ) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; @@ -145,6 +147,10 @@ void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, void ME_GetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; void ME_GetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) DECLSPEC_HIDDEN; +static inline ME_DisplayItem *run_get_di( ME_Run *run ) +{ + return (ME_DisplayItem *)((ptrdiff_t)run - offsetof(ME_DisplayItem, member)); +} /* caret.c */ void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index b5408320ca8..66925ca3434 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -27,6 +27,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); WINE_DECLARE_DEBUG_CHANNEL(richedit_check); WINE_DECLARE_DEBUG_CHANNEL(richedit_lists); +ME_Run *run_next( ME_Run *run ) +{ + ME_DisplayItem *item = run_get_di( run ); + + if (ME_NextRun( NULL, &item, FALSE )) + return &item->member.run; + + return NULL; +} + +ME_Run *run_prev( ME_Run *run ) +{ + ME_DisplayItem *item = run_get_di( run ); + + if (ME_PrevRun( NULL, &item, FALSE )) + return &item->member.run; + + return NULL; +} + /****************************************************************************** * ME_CanJoinRuns * diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 499ba934a06..cde46e2d7cf 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -44,9 +44,8 @@ typedef struct tagME_WrapContext POINT pt; BOOL bOverflown, bWordWrap; ME_DisplayItem *pPara; - ME_DisplayItem *pRowStart; - - ME_DisplayItem *pLastSplittableRun; + ME_Run *pRowStart; + ME_Run *pLastSplittableRun; } ME_WrapContext; static BOOL get_run_glyph_buffers( ME_Run *run ) @@ -128,18 +127,16 @@ static void calc_run_extent(ME_Context *c, const ME_Paragraph *para, int startx, * Splits a run into two in a given place. It also updates the screen position * and size (extent) of the newly generated runs. */ -static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *item, int nVChar) +static ME_Run *split_run_extents( ME_WrapContext *wc, ME_Run *run, int nVChar ) { ME_TextEditor *editor = wc->context->editor; - ME_Run *run, *run2; + ME_Run *run2; ME_Paragraph *para = &wc->pPara->member.para; - ME_Cursor cursor = {wc->pPara, item, nVChar}; + ME_Cursor cursor = {wc->pPara, run_get_di( run ), nVChar}; - assert(item->member.run.nCharOfs != -1); + assert( run->nCharOfs != -1 ); ME_CheckCharOffsets(editor); - run = &item->member.run; - TRACE("Before split: %s(%d, %d)\n", debugstr_run( run ), run->pt.x, run->pt.y); @@ -152,7 +149,7 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite shape_run( wc->context, run2 ); calc_run_extent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); - run2->pt.x = run->pt.x+run->nWidth; + run2->pt.x = run->pt.x + run->nWidth; run2->pt.y = run->pt.y; ME_CheckCharOffsets(editor); @@ -161,7 +158,7 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite debugstr_run( run ), run->pt.x, run->pt.y, debugstr_run( run2 ), run2->pt.x, run2->pt.y); - return cursor.pRun; + return &cursor.pRun->member.run; } /****************************************************************************** @@ -233,22 +230,20 @@ static void ME_BeginRow(ME_WrapContext *wc) wc->pt.y++; } -static void layout_row( ME_DisplayItem *start, const ME_DisplayItem *end ) +static void layout_row( ME_Run *start, ME_Run *last ) { - ME_DisplayItem *p; + ME_Run *run; int i, num_runs = 0; int buf[16 * 5]; /* 5 arrays - 4 of int & 1 of BYTE, alloc space for 5 of ints */ int *vis_to_log = buf, *log_to_vis, *widths, *pos; BYTE *levels; BOOL found_black = FALSE; - for (p = end->prev; p != start->prev; p = p->prev) + for (run = last; run; run = run_prev( run )) { - if (p->type == diRun) - { - if (!found_black) found_black = !(p->member.run.nFlags & (MERF_WHITESPACE | MERF_ENDPARA)); - if (found_black) num_runs++; - } + if (!found_black) found_black = !(run->nFlags & (MERF_WHITESPACE | MERF_ENDPARA)); + if (found_black) num_runs++; + if (run == start) break; } TRACE("%d runs\n", num_runs); @@ -262,131 +257,125 @@ static void layout_row( ME_DisplayItem *start, const ME_DisplayItem *end ) pos = vis_to_log + 3 * num_runs; levels = (BYTE*)(vis_to_log + 4 * num_runs); - for (i = 0, p = start; i < num_runs; p = p->next) + for (i = 0, run = start; i < num_runs; run = run_next( run )) { - if (p->type == diRun) - { - levels[i] = p->member.run.script_analysis.s.uBidiLevel; - widths[i] = p->member.run.nWidth; - TRACE( "%d: level %d width %d\n", i, levels[i], widths[i] ); - i++; - } + levels[i] = run->script_analysis.s.uBidiLevel; + widths[i] = run->nWidth; + TRACE( "%d: level %d width %d\n", i, levels[i], widths[i] ); + i++; } ScriptLayout( num_runs, levels, vis_to_log, log_to_vis ); - pos[0] = start->member.run.para->pt.x; + pos[0] = run->para->pt.x; for (i = 1; i < num_runs; i++) pos[i] = pos[i - 1] + widths[ vis_to_log[ i - 1 ] ]; - for (i = 0, p = start; i < num_runs; p = p->next) + for (i = 0, run = start; i < num_runs; run = run_next( run )) { - if (p->type == diRun) - { - p->member.run.pt.x = pos[ log_to_vis[ i ] ]; - TRACE( "%d: x = %d\n", i, p->member.run.pt.x ); - i++; - } + run->pt.x = pos[ log_to_vis[ i ] ]; + TRACE( "%d: x = %d\n", i, run->pt.x ); + i++; } if (vis_to_log != buf) heap_free( vis_to_log ); } -static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) +static void ME_InsertRowStart( ME_WrapContext *wc, ME_Run *last ) { - ME_DisplayItem *p, *row; - ME_Paragraph *para = &wc->pPara->member.para; - BOOL bSkippingSpaces = TRUE; - int ascent = 0, descent = 0, width=0, shift = 0, align = 0; + ME_Run *run; + ME_DisplayItem *row; + ME_Paragraph *para = &wc->pPara->member.para; + BOOL bSkippingSpaces = TRUE; + int ascent = 0, descent = 0, width = 0, shift = 0, align = 0; - /* Include height of para numbering label */ - if (wc->nRow == 0 && para->fmt.wNumbering) - { - ascent = para->para_num.style->tm.tmAscent; - descent = para->para_num.style->tm.tmDescent; - } + /* Include height of para numbering label */ + if (wc->nRow == 0 && para->fmt.wNumbering) + { + ascent = para->para_num.style->tm.tmAscent; + descent = para->para_num.style->tm.tmDescent; + } - for (p = pEnd->prev; p!=wc->pRowStart->prev; p = p->prev) - { - /* ENDPARA run shouldn't affect row height, except if it's the only run in the paragraph */ - if (p->type==diRun && ((p==wc->pRowStart) || !(p->member.run.nFlags & MERF_ENDPARA))) { /* FIXME add more run types */ - if (p->member.run.nAscent>ascent) - ascent = p->member.run.nAscent; - if (p->member.run.nDescent>descent) - descent = p->member.run.nDescent; - if (bSkippingSpaces) + for (run = last; run; run = run_prev( run )) + { + /* ENDPARA run shouldn't affect row height, except if it's the only run in the paragraph */ + if (run == wc->pRowStart || !(run->nFlags & MERF_ENDPARA)) { - /* Exclude space characters from run width. - * Other whitespace or delimiters are not treated this way. */ - int len = p->member.run.len; - WCHAR *text = get_text( &p->member.run, len - 1 ); - - assert (len); - if (~p->member.run.nFlags & MERF_GRAPHICS) - while (len && *(text--) == ' ') - len--; - if (len) - { - if (len == p->member.run.len) - width += p->member.run.nWidth; - else - width += ME_PointFromCharContext( wc->context, &p->member.run, len, FALSE ); - } - bSkippingSpaces = !len; - } else if (!(p->member.run.nFlags & MERF_ENDPARA)) - width += p->member.run.nWidth; - } - } + if (run->nAscent>ascent) ascent = run->nAscent; + if (run->nDescent>descent) descent = run->nDescent; + if (bSkippingSpaces) + { + /* Exclude space characters from run width. + * Other whitespace or delimiters are not treated this way. */ + int len = run->len; + WCHAR *text = get_text( run, len - 1 ); + + assert(len); + if (~run->nFlags & MERF_GRAPHICS) + while (len && *(text--) == ' ') len--; + if (len) + { + if (len == run->len) + width += run->nWidth; + else + width += ME_PointFromCharContext( wc->context, run, len, FALSE ); + } + bSkippingSpaces = !len; + } + else if (!(run->nFlags & MERF_ENDPARA)) + width += run->nWidth; + } + if (run == wc->pRowStart) break; + } - para->nWidth = max(para->nWidth, width); - row = ME_MakeRow(ascent+descent, ascent, width); - if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ - (para->fmt.dwMask & PFM_TABLE) && (para->fmt.wEffects & PFE_TABLE)) - { - /* The text was shifted down in ME_BeginRow so move the wrap context - * back to where it should be. */ - wc->pt.y--; - /* The height of the row is increased by the borders. */ - row->member.row.nHeight += 2; - } - row->member.row.pt = wc->pt; - row->member.row.nLMargin = (!wc->nRow ? wc->nFirstMargin : wc->nLeftMargin); - row->member.row.nRMargin = wc->nRightMargin; - assert(para->fmt.dwMask & PFM_ALIGNMENT); - align = para->fmt.wAlignment; - if (align == PFA_CENTER) - shift = max((wc->nAvailWidth-width)/2, 0); - if (align == PFA_RIGHT) - shift = max(wc->nAvailWidth-width, 0); - - if (para->nFlags & MEPF_COMPLEX) layout_row( wc->pRowStart, pEnd ); - - row->member.row.pt.x = row->member.row.nLMargin + shift; - for (p = wc->pRowStart; p!=pEnd; p = p->next) - { - if (p->type==diRun) { /* FIXME add more run types */ - p->member.run.pt.x += row->member.row.nLMargin+shift; + para->nWidth = max(para->nWidth, width); + row = ME_MakeRow( ascent + descent, ascent, width ); + if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ + (para->fmt.dwMask & PFM_TABLE) && (para->fmt.wEffects & PFE_TABLE)) + { + /* The text was shifted down in ME_BeginRow so move the wrap context + * back to where it should be. */ + wc->pt.y--; + /* The height of the row is increased by the borders. */ + row->member.row.nHeight += 2; } - } + row->member.row.pt = wc->pt; + row->member.row.nLMargin = (!wc->nRow ? wc->nFirstMargin : wc->nLeftMargin); + row->member.row.nRMargin = wc->nRightMargin; + assert(para->fmt.dwMask & PFM_ALIGNMENT); + align = para->fmt.wAlignment; + if (align == PFA_CENTER) shift = max((wc->nAvailWidth-width)/2, 0); + if (align == PFA_RIGHT) shift = max(wc->nAvailWidth-width, 0); - if (wc->nRow == 0 && para->fmt.wNumbering) - { - para->para_num.pt.x = wc->nParaNumOffset + shift; - para->para_num.pt.y = wc->pt.y + row->member.row.nBaseline; - } + if (para->nFlags & MEPF_COMPLEX) layout_row( wc->pRowStart, last ); + + row->member.row.pt.x = row->member.row.nLMargin + shift; + + for (run = wc->pRowStart; run; run = run_next( run )) + { + run->pt.x += row->member.row.nLMargin+shift; + if (run == last) break; + } + + if (wc->nRow == 0 && para->fmt.wNumbering) + { + para->para_num.pt.x = wc->nParaNumOffset + shift; + para->para_num.pt.y = wc->pt.y + row->member.row.nBaseline; + } - ME_InsertBefore(wc->pRowStart, row); - wc->nRow++; - wc->pt.y += row->member.row.nHeight; - ME_BeginRow(wc); + ME_InsertBefore( run_get_di( wc->pRowStart ), row ); + wc->nRow++; + wc->pt.y += row->member.row.nHeight; + ME_BeginRow( wc ); } -static void ME_WrapEndParagraph(ME_WrapContext *wc, ME_DisplayItem *p) +static void ME_WrapEndParagraph( ME_WrapContext *wc ) { ME_DisplayItem *para = wc->pPara; PARAFORMAT2 *pFmt = &para->member.para.fmt; - if (wc->pRowStart) - ME_InsertRowStart(wc, p); + + if (wc->pRowStart) ME_InsertRowStart( wc, para->member.para.eop_run ); + if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) { @@ -394,30 +383,16 @@ static void ME_WrapEndParagraph(ME_WrapContext *wc, ME_DisplayItem *p) * text down by one pixel for the border, so fix up the wrap context. */ wc->pt.y--; } - - /* - p = para->next; - while(p) { - if (p->type == diParagraph || p->type == diTextEnd) - return; - if (p->type == diRun) - { - ME_Run *run = &p->member.run; - TRACE("%s - (%d, %d)\n", debugstr_run(run), run->pt.x, run->pt.y); - } - p = p->next; - } - */ } -static void ME_WrapSizeRun(ME_WrapContext *wc, ME_DisplayItem *p) +static void ME_WrapSizeRun( ME_WrapContext *wc, ME_Run *run ) { /* FIXME compose style (out of character and paragraph styles) here */ - ME_UpdateRunFlags(wc->context->editor, &p->member.run); + ME_UpdateRunFlags( wc->context->editor, run ); - calc_run_extent(wc->context, &wc->pPara->member.para, - wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, &p->member.run); + calc_run_extent( wc->context, &wc->pPara->member.para, + wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run ); } @@ -453,173 +428,169 @@ static int reverse_find_whitespace(const WCHAR *s, int start) return i; } -static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, int i) +static ME_Run *ME_MaximizeSplit( ME_WrapContext *wc, ME_Run *run, int i ) { - ME_DisplayItem *pp, *piter = p; + ME_Run *new_run, *iter = run; int j; if (!i) return NULL; - j = reverse_find_non_whitespace( get_text( &p->member.run, 0 ), i); - if (j>0) { - pp = split_run_extents(wc, piter, j); - wc->pt.x += piter->member.run.nWidth; - return pp; + j = reverse_find_non_whitespace( get_text( run, 0 ), i ); + if (j > 0) + { + new_run = split_run_extents( wc, iter, j ); + wc->pt.x += iter->nWidth; + return new_run; } else { - pp = piter; + new_run = iter; /* omit all spaces before split point */ - while(piter != wc->pRowStart) + while (iter != wc->pRowStart) { - piter = ME_FindItemBack(piter, diRun); - if (piter->member.run.nFlags & MERF_WHITESPACE) + iter = run_prev( iter ); + if (iter->nFlags & MERF_WHITESPACE) { - pp = piter; + new_run = iter; continue; } - if (piter->member.run.nFlags & MERF_ENDWHITE) + if (iter->nFlags & MERF_ENDWHITE) { - i = reverse_find_non_whitespace( get_text( &piter->member.run, 0 ), - piter->member.run.len ); - pp = split_run_extents(wc, piter, i); - wc->pt = pp->member.run.pt; - return pp; + i = reverse_find_non_whitespace( get_text( iter, 0 ), iter->len ); + new_run = split_run_extents( wc, iter, i ); + wc->pt = new_run->pt; + return new_run; } /* this run is the end of spaces, so the run edge is a good point to split */ - wc->pt = pp->member.run.pt; + wc->pt = new_run->pt; wc->bOverflown = TRUE; - TRACE("Split point is: %s|%s\n", debugstr_run( &piter->member.run ), debugstr_run( &pp->member.run )); - return pp; + TRACE( "Split point is: %s|%s\n", debugstr_run( iter ), debugstr_run( new_run ) ); + return new_run; } - wc->pt = piter->member.run.pt; - return piter; + wc->pt = iter->pt; + return iter; } } -static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem *p, int loc) +static ME_Run *ME_SplitByBacktracking( ME_WrapContext *wc, ME_Run *run, int loc ) { - ME_DisplayItem *new_run; + ME_Run *new_run; int i, idesp, len; - ME_Run *run = &p->member.run; idesp = i = find_split_point( wc->context, loc, run ); len = run->len; - assert(len>0); - assert(i<len); - if (i) { + assert( len > 0 ); + assert( i < len ); + if (i) + { /* don't split words */ i = reverse_find_whitespace( get_text( run, 0 ), i ); - new_run = ME_MaximizeSplit(wc, p, i); + new_run = ME_MaximizeSplit(wc, run, i); if (new_run) return new_run; } - TRACE("Must backtrack to split at: %s\n", debugstr_run( &p->member.run )); + TRACE("Must backtrack to split at: %s\n", debugstr_run( run )); if (wc->pLastSplittableRun) { - if (wc->pLastSplittableRun->member.run.nFlags & (MERF_GRAPHICS|MERF_TAB)) + if (wc->pLastSplittableRun->nFlags & (MERF_GRAPHICS|MERF_TAB)) { - wc->pt = wc->pLastSplittableRun->member.run.pt; + wc->pt = wc->pLastSplittableRun->pt; return wc->pLastSplittableRun; } - else if (wc->pLastSplittableRun->member.run.nFlags & MERF_SPLITTABLE) + else if (wc->pLastSplittableRun->nFlags & MERF_SPLITTABLE) { /* the following two lines are just to check if we forgot to call UpdateRunFlags earlier, they serve no other purpose */ ME_UpdateRunFlags(wc->context->editor, run); - assert((wc->pLastSplittableRun->member.run.nFlags & MERF_SPLITTABLE)); + assert((wc->pLastSplittableRun->nFlags & MERF_SPLITTABLE)); - p = wc->pLastSplittableRun; - run = &p->member.run; + run = wc->pLastSplittableRun; len = run->len; /* don't split words */ i = reverse_find_whitespace( get_text( run, 0 ), len ); if (i == len) i = reverse_find_non_whitespace( get_text( run, 0 ), len ); - new_run = split_run_extents(wc, p, i); - wc->pt = new_run->member.run.pt; + new_run = split_run_extents(wc, run, i); + wc->pt = new_run->pt; return new_run; } else { /* restart from the first run beginning with spaces */ - wc->pt = wc->pLastSplittableRun->member.run.pt; + wc->pt = wc->pLastSplittableRun->pt; return wc->pLastSplittableRun; } } - TRACE("Backtracking failed, trying desperate: %s\n", debugstr_run( &p->member.run )); + TRACE("Backtracking failed, trying desperate: %s\n", debugstr_run( run )); /* OK, no better idea, so assume we MAY split words if we can split at all*/ if (idesp) - return split_run_extents(wc, p, idesp); + return split_run_extents(wc, run, idesp); else - if (wc->pRowStart && p != wc->pRowStart) + if (wc->pRowStart && run != wc->pRowStart) { /* don't need to break current run, because it's possible to split before this run */ wc->bOverflown = TRUE; - return p; + return run; } else { /* split point inside first character - no choice but split after that char */ - if (len != 1) { + if (len != 1) /* the run is more than 1 char, so we may split */ - return split_run_extents(wc, p, 1); - } + return split_run_extents( wc, run, 1 ); + /* the run is one char, can't split it */ - return p; + return run; } } -static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) +static ME_Run *ME_WrapHandleRun( ME_WrapContext *wc, ME_Run *run ) { - ME_DisplayItem *pp; - ME_Run *run; + ME_Run *new_run; int len; - assert(p->type == diRun); - if (!wc->pRowStart) - wc->pRowStart = p; - run = &p->member.run; + if (!wc->pRowStart) wc->pRowStart = run; run->pt.x = wc->pt.x; run->pt.y = wc->pt.y; - ME_WrapSizeRun(wc, p); + ME_WrapSizeRun( wc, run ); len = run->len; if (wc->bOverflown) /* just skipping final whitespaces */ { /* End paragraph run can't overflow to the next line by itself. */ - if (run->nFlags & MERF_ENDPARA) - return p->next; + if (run->nFlags & MERF_ENDPARA) return run_next( run ); - if (run->nFlags & MERF_WHITESPACE) { + if (run->nFlags & MERF_WHITESPACE) + { wc->pt.x += run->nWidth; /* skip runs consisting of only whitespaces */ - return p->next; + return run_next( run ); } - if (run->nFlags & MERF_STARTWHITE) { + if (run->nFlags & MERF_STARTWHITE) + { /* try to split the run at the first non-white char */ int black; black = find_non_whitespace( get_text( run, 0 ), run->len, 0 ); - if (black) { + if (black) + { + ME_Run *new_run; wc->bOverflown = FALSE; - pp = split_run_extents(wc, p, black); - calc_run_extent(wc->context, &wc->pPara->member.para, - wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, - &pp->member.run); - ME_InsertRowStart(wc, pp); - return pp; + new_run = split_run_extents( wc, run, black ); + calc_run_extent( wc->context, &wc->pPara->member.para, + wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run ); + ME_InsertRowStart( wc, run ); + return new_run; } } /* black run: the row goes from pRowStart to the previous run */ - ME_InsertRowStart(wc, p); - return p; + ME_InsertRowStart( wc, run_prev( run ) ); + return run; } /* simply end the current row and move on to next one */ if (run->nFlags & MERF_ENDROW) { - p = p->next; - ME_InsertRowStart(wc, p); - return p; + ME_InsertRowStart( wc, run ); + return run_next( run ); } /* will current run fit? */ @@ -631,35 +602,35 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) if (run->nFlags & (MERF_WHITESPACE | MERF_ENDPARA)) { /* let the overflow logic handle it */ wc->bOverflown = TRUE; - return p; + return run; } /* TAB: we can split before */ if (run->nFlags & MERF_TAB) { wc->bOverflown = TRUE; - if (wc->pRowStart == p) + if (wc->pRowStart == run) /* Don't split before the start of the run, or we will get an * endless loop. */ - return p->next; + return run_next( run ); else - return p; + return run; } /* graphics: we can split before, if run's width is smaller than row's width */ if ((run->nFlags & MERF_GRAPHICS) && run->nWidth <= wc->nAvailWidth) { wc->bOverflown = TRUE; - return p; + return run; } /* can we separate out the last spaces ? (to use overflow logic later) */ if (run->nFlags & MERF_ENDWHITE) { /* we aren't sure if it's *really* necessary, it's a good start however */ int black = reverse_find_non_whitespace( get_text( run, 0 ), len ); - split_run_extents(wc, p, black); + split_run_extents( wc, run, black ); /* handle both parts again */ - return p; + return run; } /* determine the split point by backtracking */ - pp = ME_SplitByBacktracking(wc, p, loc); - if (pp == wc->pRowStart) + new_run = ME_SplitByBacktracking( wc, run, loc ); + if (new_run == wc->pRowStart) { if (run->nFlags & MERF_STARTWHITE) { @@ -671,32 +642,32 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) /* The lines will only contain spaces, and the rest of the run will * overflow onto the next line. */ wc->bOverflown = TRUE; - return p; + return run; } /* Couldn't split the first run, possible because we have a large font * with a single character that caused an overflow. */ wc->pt.x += run->nWidth; - return p->next; + return run_next( run ); } - if (p != pp) /* found a suitable split point */ + if (run != new_run) /* found a suitable split point */ { wc->bOverflown = TRUE; - return pp; + return new_run; } /* we detected that it's best to split on start of this run */ if (wc->bOverflown) - return pp; + return new_run; ERR("failure!\n"); /* not found anything - writing over margins is the only option left */ } if ((run->nFlags & (MERF_SPLITTABLE | MERF_STARTWHITE)) - || ((run->nFlags & (MERF_GRAPHICS|MERF_TAB)) && (p != wc->pRowStart))) + || ((run->nFlags & (MERF_GRAPHICS|MERF_TAB)) && (run != wc->pRowStart))) { - wc->pLastSplittableRun = p; + wc->pLastSplittableRun = run; } wc->pt.x += run->nWidth; - return p->next; + return run_next( run ); } static int ME_GetParaLineSpace(ME_Context* c, ME_Paragraph* para) @@ -860,8 +831,9 @@ static HRESULT shape_para( ME_Context *c, ME_DisplayItem *p ) return hr; } -static void ME_WrapTextParagraph(ME_TextEditor *editor, ME_Context *c, ME_DisplayItem *tp) { - ME_DisplayItem *p; +static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_DisplayItem *tp ) +{ + ME_Run *run; ME_WrapContext wc; int border = 0; int linespace = 0; @@ -940,16 +912,13 @@ static void ME_WrapTextParagraph(ME_TextEditor *editor, ME_Context *c, ME_Displa linespace = ME_GetParaLineSpace(c, &tp->member.para); ME_BeginRow(&wc); - for (p = tp->next; p!=tp->member.para.next_para; ) { - assert(p->type != diStartRow); - if (p->type == diRun) { - p = ME_WrapHandleRun(&wc, p); - } - else p = p->next; - if (wc.nRow && p == wc.pRowStart) - wc.pt.y += linespace; + run = &ME_FindItemFwd( tp, diRun )->member.run; + while (run) + { + run = ME_WrapHandleRun( &wc, run ); + if (wc.nRow && run == wc.pRowStart) wc.pt.y += linespace; } - ME_WrapEndParagraph(&wc, p); + ME_WrapEndParagraph( &wc ); if (!(pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) && (pFmt->dwMask & PFM_BORDER) && (pFmt->wBorders & 8)) wc.pt.y += border; -- 2.23.0

1 0

[PATCH 2/2] msado15: Implement _Connection get/put Mode
by Alistair Leslie-Hughes 08 Oct '20

08 Oct '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 18 ++++++++++++++---- dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 8d69e019852..eb116fc30ed 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -54,6 +54,7 @@ struct connection LONG timeout; WCHAR *datasource; WCHAR *provider; + ConnectModeEnum mode; struct connection_point cp_connev; }; @@ -336,14 +337,22 @@ static HRESULT WINAPI connection_put_CursorLocation( _Connection *iface, CursorL static HRESULT WINAPI connection_get_Mode( _Connection *iface, ConnectModeEnum *mode ) { - FIXME( "%p, %p\n", iface, mode ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %p\n", iface, mode ); + + *mode = connection->mode; + return S_OK; } static HRESULT WINAPI connection_put_Mode( _Connection *iface, ConnectModeEnum mode ) { - FIXME( "%p, %u\n", iface, mode ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %u\n", iface, mode ); + + connection->mode = mode; + return S_OK; } static HRESULT WINAPI connection_get_Provider( _Connection *iface, BSTR *str ) @@ -665,6 +674,7 @@ HRESULT Connection_create( void **obj ) connection->timeout = 30; connection->datasource = NULL; connection->provider = SysAllocString(L"MSDASQL"); + connection->mode = adModeUnknown; connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 26c5c07a9d5..a532091fd7e 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -675,6 +675,7 @@ static void test_Connection(void) IConnectionPointContainer *pointcontainer; LONG state, timeout; BSTR str, str2, str3; + ConnectModeEnum mode; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -718,6 +719,22 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + mode = adModeUnknown; + hr = _Connection_get_Mode(connection, &mode); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(mode == adModeUnknown, "Unexpected mode value %d\n", mode); + + hr = _Connection_put_Mode(connection, adModeShareDenyNone); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + + mode = adModeUnknown; + hr = _Connection_get_Mode(connection, &mode); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(mode == adModeShareDenyNone, "Unexpected mode value %d\n", mode); + + hr = _Connection_put_Mode(connection, adModeUnknown); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + /* Default */ str = (BSTR)0xdeadbeef; hr = _Connection_get_Provider(connection, &str); -- 2.28.0

1 0

[PATCH 1/2] msado15: Implement _Connection Get/Put Provider
by Alistair Leslie-Hughes 08 Oct '20

08 Oct '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 27 +++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 38 +++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 5d8f78f53e8..8d69e019852 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -53,6 +53,7 @@ struct connection ObjectStateEnum state; LONG timeout; WCHAR *datasource; + WCHAR *provider; struct connection_point cp_connev; }; @@ -96,6 +97,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) IUnknown_Release( connection->cp_connev.sinks[i] ); } heap_free( connection->cp_connev.sinks ); + heap_free( connection->provider ); heap_free( connection->datasource ); heap_free( connection ); } @@ -346,14 +348,30 @@ static HRESULT WINAPI connection_put_Mode( _Connection *iface, ConnectModeEnum m static HRESULT WINAPI connection_get_Provider( _Connection *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + BSTR provider = NULL; + + TRACE( "%p, %p\n", iface, str ); + + if (connection->provider && !(provider = SysAllocString( connection->provider ))) return E_OUTOFMEMORY; + *str = provider; + return S_OK; } static HRESULT WINAPI connection_put_Provider( _Connection *iface, BSTR str ) { - FIXME( "%p, %s\n", iface, debugstr_w(str) ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + WCHAR *provider = NULL; + + TRACE( "%p, %s\n", iface, debugstr_w(str) ); + + if (!str) + return MAKE_ADO_HRESULT(adErrInvalidArgument); + + if (str && !(provider = strdupW( str ))) return E_OUTOFMEMORY; + heap_free( connection->provider ); + connection->provider = provider; + return S_OK; } static HRESULT WINAPI connection_get_State( _Connection *iface, LONG *state ) @@ -646,6 +664,7 @@ HRESULT Connection_create( void **obj ) connection->state = adStateClosed; connection->timeout = 30; connection->datasource = NULL; + connection->provider = SysAllocString(L"MSDASQL"); connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 1629fe15bed..26c5c07a9d5 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -718,15 +718,51 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + /* Default */ str = (BSTR)0xdeadbeef; - hr = _Connection_get_ConnectionString(connection, &str); + hr = _Connection_get_Provider(connection, &str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(!wcscmp(str, L"MSDASQL"), "wrong string %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"MSDASQL.1"); + hr = _Connection_put_Provider(connection, str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + SysFreeString(str); + + str = (BSTR)0xdeadbeef; + hr = _Connection_get_Provider(connection, &str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(!wcscmp(str, L"MSDASQL.1"), "wrong string %s\n", wine_dbgstr_w(str)); + + /* Restore default */ + str = SysAllocString(L"MSDASQL"); + hr = _Connection_put_Provider(connection, str); ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + SysFreeString(str); + + str = NULL; + hr = _Connection_put_Provider(connection, str); + ok(hr == MAKE_ADO_HRESULT(adErrInvalidArgument), "got 0x%08x\n", hr); + SysFreeString(str); + + str = (BSTR)0xdeadbeef; + hr = _Connection_get_ConnectionString(connection, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(str == NULL, "got %p\n", str); str = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); hr = _Connection_put_ConnectionString(connection, str); ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + /* Show put_ConnectionString effects Provider */ + str3 = (BSTR)0xdeadbeef; + hr = _Connection_get_Provider(connection, &str3); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(str3 != NULL, "Expected value got NULL\n"); + todo_wine ok(!wcscmp(str3, L"MSDASQL.1"), "wrong string %s\n", wine_dbgstr_w(str3)); + SysFreeString(str3); + if (0) /* Crashes on windows */ { hr = _Connection_get_ConnectionString(connection, NULL); -- 2.28.0

1 0

[PATCH 3/5] dssenh: Implement CPAcquireContext and CPReleaseContext.
by Hans Leidekker 08 Oct '20

08 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/Makefile.in | 1 + dlls/dssenh/main.c | 256 ++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 42 ++++++ 3 files changed, 297 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in index 8015768f99..67b0d6a141 100644 --- a/dlls/dssenh/Makefile.in +++ b/dlls/dssenh/Makefile.in @@ -1,4 +1,5 @@ MODULE = dssenh.dll +IMPORTS = bcrypt crypt32 advapi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 3d5e8d97d6..ea082b29e3 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -22,23 +22,275 @@ #include "windef.h" #include "winbase.h" #include "wincrypt.h" +#include "winreg.h" +#include "bcrypt.h" #include "objbase.h" #include "rpcproxy.h" #include "wine/debug.h" +#include "wine/heap.h" static HINSTANCE instance; WINE_DEFAULT_DEBUG_CHANNEL(dssenh); +#define MAGIC_KEY (('K' << 24) | ('E' << 16) | ('Y' << 8) | '0') +struct key +{ + DWORD magic; + DWORD algid; + DWORD flags; + BCRYPT_ALG_HANDLE alg_handle; + BCRYPT_KEY_HANDLE handle; +}; + +#define MAGIC_CONTAINER (('C' << 24) | ('O' << 16) | ('N' << 8) | 'T') +struct container +{ + DWORD magic; + DWORD flags; + struct key *exch_key; + struct key *sign_key; + char name[MAX_PATH]; +}; + +static const char dss_path_fmt[] = "Software\\Wine\\Crypto\\DSS\\%s"; + +static BOOL create_container_regkey( struct container *container, REGSAM sam, HKEY *hkey ) +{ + char path[sizeof(dss_path_fmt) + MAX_PATH]; + HKEY rootkey; + + sprintf( path, dss_path_fmt, container->name ); + + if (container->flags & CRYPT_MACHINE_KEYSET) + rootkey = HKEY_LOCAL_MACHINE; + else + rootkey = HKEY_CURRENT_USER; + + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\DSS */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\DSS */ + return !RegCreateKeyExA( rootkey, path, 0, NULL, REG_OPTION_NON_VOLATILE, sam, NULL, hkey, NULL ); +} + +static struct container *create_key_container( const char *name, DWORD flags ) +{ + struct container *ret; + + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; + ret->magic = MAGIC_CONTAINER; + ret->flags = flags; + if (name) strcpy( ret->name, name ); + + if (!(flags & CRYPT_VERIFYCONTEXT)) + { + HKEY hkey; + if (create_container_regkey( ret, KEY_WRITE, &hkey )) RegCloseKey( hkey ); + } + return ret; +} + +static BOOL open_container_regkey( const char *name, DWORD flags, REGSAM access, HKEY *hkey ) +{ + char path[sizeof(dss_path_fmt) + MAX_PATH]; + HKEY rootkey; + + sprintf( path, dss_path_fmt, name ); + + if (flags & CRYPT_MACHINE_KEYSET) + rootkey = HKEY_LOCAL_MACHINE; + else + rootkey = HKEY_CURRENT_USER; + + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\DSS */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\DSS */ + return !RegOpenKeyExA( rootkey, path, 0, access, hkey ); +} + +static const WCHAR *map_keyspec_to_keypair_name( DWORD keyspec ) +{ + const WCHAR *name; + + switch (keyspec) + { + case AT_KEYEXCHANGE: + name = L"KeyExchangeKeyPair"; + break; + case AT_SIGNATURE: + name = L"SignatureKeyPair"; + break; + default: + ERR( "invalid key spec %u\n", keyspec ); + return NULL; + } + return name; +} + +static struct key *create_key( ALG_ID algid, DWORD flags ) +{ + struct key *ret; + const WCHAR *alg; + + switch (algid) + { + case AT_SIGNATURE: + case CALG_DSS_SIGN: + alg = BCRYPT_DSA_ALGORITHM; + break; + + default: + FIXME( "unhandled algorithm %08x\n", algid ); + return NULL; + } + + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; + + ret->magic = MAGIC_KEY; + ret->algid = algid; + ret->flags = flags; + if (BCryptOpenAlgorithmProvider( &ret->alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) + { + heap_free( ret ); + return NULL; + } + return ret; +} + +static void destroy_key( struct key *key ) +{ + if (!key) return; + BCryptDestroyKey( key->handle ); + BCryptCloseAlgorithmProvider( key->alg_handle, 0 ); + key->magic = 0; + heap_free( key ); +} + +static struct key *import_key( DWORD keyspec, BYTE *data, DWORD len ) +{ + struct key *ret; + + if (!(ret = create_key( keyspec, 0 ))) return NULL; + + if (BCryptImportKeyPair( ret->alg_handle, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, &ret->handle, data, len, 0 )) + { + WARN( "failed to import key\n" ); + destroy_key( ret ); + return NULL; + } + return ret; +} + +static struct key *read_key( HKEY hkey, DWORD keyspec, DWORD flags ) +{ + const WCHAR *value; + DWORD type, len; + BYTE *data; + DATA_BLOB blob_in, blob_out; + struct key *ret = NULL; + + if (!(value = map_keyspec_to_keypair_name( keyspec ))) return NULL; + if (RegQueryValueExW( hkey, value, 0, &type, NULL, &len )) return NULL; + if (!(data = heap_alloc( len ))) return NULL; + + if (!RegQueryValueExW( hkey, value, 0, &type, data, &len )) + { + blob_in.pbData = data; + blob_in.cbData = len; + if (CryptUnprotectData( &blob_in, NULL, NULL, NULL, NULL, flags, &blob_out )) + { + ret = import_key( keyspec, blob_out.pbData, blob_out.cbData ); + LocalFree( blob_out.pbData ); + } + } + + heap_free( data ); + return ret; +} + +static void destroy_container( struct container *container ) +{ + if (!container) return; + destroy_key( container->exch_key ); + destroy_key( container->sign_key ); + container->magic = 0; + heap_free( container ); +} + +static struct container *read_key_container( const char *name, DWORD flags ) +{ + DWORD protect_flags = (flags & CRYPT_MACHINE_KEYSET) ? CRYPTPROTECT_LOCAL_MACHINE : 0; + struct container *ret; + HKEY hkey; + + if (!open_container_regkey( name, flags, KEY_READ, &hkey )) return NULL; + + if ((ret = create_key_container( name, flags ))) + { + ret->exch_key = read_key( hkey, AT_SIGNATURE, protect_flags ); + ret->sign_key = read_key( hkey, AT_KEYEXCHANGE, protect_flags ); + } + + RegCloseKey( hkey ); + return ret; +} + BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) { - return FALSE; + struct container *ret; + char name[MAX_PATH]; + + TRACE( "%p, %s, %08x, %p\n", ret_prov, debugstr_a(container), flags, vtable ); + + if (container && *container) + { + if (lstrlenA( container ) >= sizeof(name)) return FALSE; + lstrcpyA( name, container ); + } + else + { + DWORD len = sizeof(name); + if (!GetUserNameA( name, &len )) return FALSE; + } + + switch (flags) + { + case 0: + ret = read_key_container( name, flags ); + break; + + case CRYPT_NEWKEYSET: + if ((ret = read_key_container( name, flags ))) + { + heap_free( ret ); + SetLastError( NTE_EXISTS ); + return FALSE; + } + ret = create_key_container( name, flags ); + break; + + case CRYPT_VERIFYCONTEXT: + ret = create_key_container( "", flags ); + break; + + default: + FIXME( "unsupported flags %08x\n", flags ); + return FALSE; + } + + if (!ret) return FALSE; + *ret_prov = (HCRYPTPROV)ret; + return TRUE; } BOOL WINAPI CPReleaseContext( HCRYPTPROV hprov, DWORD flags ) { - return FALSE; + struct container *container = (struct container *)hprov; + + TRACE( "%p, %08x\n", (void *)hprov, flags ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + destroy_container( container ); + return TRUE; } BOOL WINAPI CPGenKey( HCRYPTPROV hprov, ALG_ID algid, DWORD flags, HCRYPTKEY *ret_key ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index c88fcd1466..d549b985d6 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -323,6 +323,7 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t static void test_keylength(void) { HCRYPTPROV hProv = 0; + HCRYPTKEY key; BOOL result; /* acquire base dss provider */ @@ -335,6 +336,17 @@ static void test_keylength(void) } ok(result, "Expected no errors.\n"); + result = CryptGenKey(hProv, AT_SIGNATURE, 0, &key); + todo_wine ok(result, "Expected no errors.\n"); + if (!result) + { + skip("skipping key length tests\n"); + return; + } + + result = CryptDestroyKey(key); + ok(result, "Expected no errors.\n"); + /* perform keylength tests */ test_keylength_array(hProv, baseDSS_keylength, ARRAY_SIZE(baseDSS_keylength)); @@ -434,6 +446,11 @@ static void test_hash(const struct hash_test *tests, int testLen) /* test algid hash */ result = CryptCreateHash(hProv, tests[i].algid, 0, 0, &hHash); + if (!result) + { + skip("skipping hash tests\n"); + return; + } ok(result, "Expected creation of a hash.\n"); result = CryptHashData(hHash, data, dataLen, 0); @@ -588,6 +605,11 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + if (!result) + { + skip("skipping encryption tests\n"); + return; + } ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); @@ -673,6 +695,11 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + if (!result) + { + skip("skipping ciper modes tests\n"); + return; + } ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); @@ -831,6 +858,11 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Get a private key of array specified ALG_ID */ result = CryptImportKey(hProv, tests[i].privateKey, tests[i].keyLen, 0, 0, &privKey); + if (!result) + { + skip("skipping sign tests\n"); + return; + } ok(result, "Failed to imported key, got %x\n", GetLastError()); /* Create hash object and add data for signature 1 */ @@ -1084,6 +1116,11 @@ static void test_keyExchange_baseDSS(HCRYPTPROV hProv, const struct keyExchange_ /* Generate key exchange keys for user1 and user2 */ result = CryptGenKey(hProv, tests[i].algid, 512 << 16 | CRYPT_PREGEN, &privKey1); + if (!result) + { + skip("skipping key exchange tests\n"); + return; + } ok(!result && GetLastError() == NTE_BAD_ALGID, "Expected NTE_BAD_ALGID, got %x\n", GetLastError()); @@ -1233,6 +1270,11 @@ static void test_keyExchange_dssDH(HCRYPTPROV hProv, const struct keyExchange_te /* Generate key exchange keys for user1 and user2 */ result = CryptGenKey(hProv, tests[i].algid, 512 << 16 | CRYPT_PREGEN, &privKey1); + if (!result) + { + skip("skipping key exchange tests\n"); + return; + } ok(result, "Failed to generate a key for user1, got %x\n", GetLastError()); result = CryptGenKey(hProv, tests[i].algid, 512 << 16 | CRYPT_PREGEN, &privKey2); -- 2.28.0

4 3

[PATCH] bcrypt/tests: Use wide-char string literals.
by Michael Stefaniuc 08 Oct '20

08 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 7fdc0ac7fb2..d499ce65a65 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -99,33 +99,20 @@ static void test_BCryptGenRandom(void) static void test_BCryptGetFipsAlgorithmMode(void) { - static const WCHAR policyKeyVistaW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'L','s','a','\\', - 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; - static const WCHAR policyValueVistaW[] = {'E','n','a','b','l','e','d',0}; - static const WCHAR policyKeyXPW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'L','s','a',0}; - static const WCHAR policyValueXPW[] = { - 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; HKEY hkey = NULL; BOOLEAN expected; BOOLEAN enabled; DWORD value, count[2] = {sizeof(value), sizeof(value)}; NTSTATUS ret; - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyVistaW, &hkey) == ERROR_SUCCESS && - RegQueryValueExW(hkey, policyValueVistaW, NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\Lsa\\FIPSAlgorithmPolicy", &hkey) == ERROR_SUCCESS && + RegQueryValueExW(hkey, L"Enabled", NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) { expected = !!value; } - else if (RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyXPW, &hkey) == ERROR_SUCCESS && - RegQueryValueExW(hkey, policyValueXPW, NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) + else if (RegOpenKeyW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Lsa", &hkey) == ERROR_SUCCESS && + RegQueryValueExW(hkey, L"FIPSAlgorithmPolicy", NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) { expected = !!value; } @@ -2173,13 +2160,12 @@ static void test_ECDH(void) static void test_BCryptEnumContextFunctions(void) { - static const WCHAR sslW[] = {'S','S','L',0}; CRYPT_CONTEXT_FUNCTIONS *buffer; NTSTATUS status; ULONG buflen; buffer = NULL; - status = pBCryptEnumContextFunctions( CRYPT_LOCAL, sslW, NCRYPT_SCHANNEL_INTERFACE, &buflen, &buffer ); + status = pBCryptEnumContextFunctions( CRYPT_LOCAL, L"SSL", NCRYPT_SCHANNEL_INTERFACE, &buflen, &buffer ); todo_wine ok( status == STATUS_SUCCESS, "got %08x\n", status); if (status == STATUS_SUCCESS) pBCryptFreeBuffer( buffer ); } -- 2.26.2

2 1

[PATCH] msiexec: Use wide-char string literals.
by Michael Stefaniuc 08 Oct '20

08 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/msiexec/msiexec.c | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 17d4bf87cdd..2bc0ba9bbef 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -46,19 +46,6 @@ struct string_list WCHAR str[1]; }; -static const WCHAR ActionAdmin[] = { - 'A','C','T','I','O','N','=','A','D','M','I','N',0 }; -static const WCHAR RemoveAll[] = { - 'R','E','M','O','V','E','=','A','L','L',0 }; - -static const WCHAR InstallRunOnce[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','s','t','a','l','l','e','r','\\', - 'R','u','n','O','n','c','e','E','n','t','r','i','e','s',0}; - static void ShowUsage(int ExitCode) { WCHAR msiexec_version[40]; @@ -339,8 +326,6 @@ static DWORD DoDllUnregisterServer(LPCWSTR DllName) static DWORD DoRegServer(void) { - static const WCHAR msiserverW[] = {'M','S','I','S','e','r','v','e','r',0}; - static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c',' ','/','V',0}; SC_HANDLE scm, service; WCHAR path[MAX_PATH+12]; DWORD len, ret = 0; @@ -351,8 +336,8 @@ static DWORD DoRegServer(void) return 1; } len = GetSystemDirectoryW(path, MAX_PATH); - lstrcpyW(path + len, msiexecW); - if ((service = CreateServiceW(scm, msiserverW, msiserverW, GENERIC_ALL, + lstrcpyW(path + len, L"\\msiexec /V"); + if ((service = CreateServiceW(scm, L"MSIServer", L"MSIServer", GENERIC_ALL, SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, path, NULL, NULL, NULL, NULL, NULL))) { @@ -369,7 +354,6 @@ static DWORD DoRegServer(void) static DWORD DoUnregServer(void) { - static const WCHAR msiserverW[] = {'M','S','I','S','e','r','v','e','r',0}; SC_HANDLE scm, service; DWORD ret = 0; @@ -378,7 +362,7 @@ static DWORD DoUnregServer(void) fprintf(stderr, "Failed to open service control manager\n"); return 1; } - if ((service = OpenServiceW(scm, msiserverW, DELETE))) + if ((service = OpenServiceW(scm, L"MSIServer", DELETE))) { if (!DeleteService(service)) { @@ -409,7 +393,6 @@ static DWORD CALLBACK custom_action_thread(void *arg) static int custom_action_server(const WCHAR *arg) { - static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x','_','%','d',0}; GUID guid, *thread_guid; DWORD64 thread64; WCHAR buffer[24]; @@ -425,7 +408,7 @@ static int custom_action_server(const WCHAR *arg) return 1; } - swprintf(buffer, ARRAY_SIZE(buffer), pipe_name, client_pid, sizeof(void *) * 8); + swprintf(buffer, ARRAY_SIZE(buffer), L"\\\\.\\pipe\\msica_%x_%d", client_pid, sizeof(void *) * 8); pipe = CreateFileW(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); if (pipe == INVALID_HANDLE_VALUE) { @@ -577,7 +560,8 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg WCHAR *buf; BOOL ret = FALSE; - r = RegOpenKeyW(HKEY_LOCAL_MACHINE, InstallRunOnce, &hkey); + r = RegOpenKeyW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\RunOnceEntries", &hkey); if(r != ERROR_SUCCESS) return FALSE; r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz); @@ -700,7 +684,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine ShowUsage(1); WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; - StringListAppend(&property_list, ActionAdmin); + StringListAppend(&property_list, L"ACTION=ADMIN"); WINE_FIXME("Administrative installs are not currently supported\n"); } else if(msi_option_prefix(argvW[i], "f")) @@ -783,7 +767,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine PackageName = argvW[i]; } WINE_TRACE("PackageName = %s\n", wine_dbgstr_w(PackageName)); - StringListAppend(&property_list, RemoveAll); + StringListAppend(&property_list, L"REMOVE=ALL"); } else if(msi_option_prefix(argvW[i], "j")) { @@ -996,11 +980,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine } else if(msi_option_equal(argvW[i], "passive")) { - static const WCHAR rebootpromptW[] = - {'R','E','B','O','O','T','P','R','O','M','P','T','=','"','S','"',0}; - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL; - StringListAppend(&property_list, rebootpromptW); + StringListAppend(&property_list, L"REBOOTPROMPT=\"S\""); } else if(msi_option_equal(argvW[i], "y")) { -- 2.26.2

2 1

[PATCH] rundll32: Use wide-char string literals.
by Michael Stefaniuc 07 Oct '20

07 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/rundll32/rundll32.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index d1caefc2e25..09a382ef910 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -83,20 +83,14 @@ static void call_entry_point( void *func, HWND hwnd, HINSTANCE inst, void *cmdli } #endif -/* - * Control_RunDLL needs to have a window. So lets make us a very - * simple window class. - */ -static const WCHAR szTitle[] = {'r','u','n','d','l','l','3','2',0}; -static const WCHAR szWindowClass[] = {'c','l','a','s','s','_','r','u','n','d','l','l','3','2',0}; -static const WCHAR kernel32[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; -static const WCHAR shell32[] = {'s','h','e','l','l','3','2','.','d','l','l',0}; - static HINSTANCE16 (WINAPI *pLoadLibrary16)(LPCSTR libname); static FARPROC16 (WINAPI *pGetProcAddress16)(HMODULE16 hModule, LPCSTR name); static void (WINAPI *pRunDLL_CallEntry16)( FARPROC proc, HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT cmdshow ); +/* + * Control_RunDLL needs to have a window. So lets make us a very simple window class. + */ static ATOM register_class(void) { WNDCLASSEXW wcex; @@ -112,7 +106,7 @@ static ATOM register_class(void) wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); wcex.lpszMenuName = NULL; - wcex.lpszClassName = szWindowClass; + wcex.lpszClassName = L"class_rundll32"; wcex.hIconSm = NULL; return RegisterClassExW(&wcex); @@ -127,7 +121,7 @@ static HINSTANCE16 load_dll16( LPCWSTR dll ) if (dllA) { WideCharToMultiByte( CP_ACP, 0, dll, -1, dllA, len, NULL, NULL ); - pLoadLibrary16 = (void *)GetProcAddress( GetModuleHandleW(kernel32), (LPCSTR)35 ); + pLoadLibrary16 = (void *)GetProcAddress( GetModuleHandleW(L"kernel32.dll"), (LPCSTR)35 ); if (pLoadLibrary16) ret = pLoadLibrary16( dllA ); HeapFree( GetProcessHeap(), 0, dllA ); } @@ -143,7 +137,7 @@ static FARPROC16 get_entry_point16( HINSTANCE16 inst, LPCWSTR entry ) if (entryA) { WideCharToMultiByte( CP_ACP, 0, entry, -1, entryA, len, NULL, NULL ); - pGetProcAddress16 = (void *)GetProcAddress( GetModuleHandleW(kernel32), (LPCSTR)37 ); + pGetProcAddress16 = (void *)GetProcAddress( GetModuleHandleW(L"kernel32.dll"), (LPCSTR)37 ); if (pGetProcAddress16) ret = pGetProcAddress16( inst, entryA ); HeapFree( GetProcessHeap(), 0, entryA ); } @@ -289,8 +283,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine /* Initialize the rundll32 class */ register_class(); - hWnd = CreateWindowW(szWindowClass, szTitle, - WS_OVERLAPPEDWINDOW|WS_VISIBLE, + hWnd = CreateWindowW(L"class_rundll32", L"rundll32", WS_OVERLAPPEDWINDOW|WS_VISIBLE, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, NULL, NULL); /* Get the dll name and API EntryPoint */ @@ -359,7 +352,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine if (win16) { - HMODULE shell = LoadLibraryW( shell32 ); + HMODULE shell = LoadLibraryW( L"shell32.dll" ); if (shell) pRunDLL_CallEntry16 = (void *)GetProcAddress( shell, (LPCSTR)122 ); if (pRunDLL_CallEntry16) pRunDLL_CallEntry16( entry_point, hWnd, instance, cmdline, info.wShowWindow ); -- 2.26.2

1 0

[PATCH] progman: Use wide-char string literals.
by Michael Stefaniuc 07 Oct '20

07 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/progman/progman.h | 8 ++++---- programs/progman/string.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/progman/progman.h b/programs/progman/progman.h index 8fd823ac7db..cc9b301354b 100644 --- a/programs/progman/progman.h +++ b/programs/progman/progman.h @@ -190,10 +190,10 @@ VOID DIALOG_Execute(void); VOID STRING_LoadMenus(VOID); /* Class names */ -extern WCHAR STRING_MAIN_WIN_CLASS_NAME[]; -extern WCHAR STRING_MDI_WIN_CLASS_NAME[]; -extern WCHAR STRING_GROUP_WIN_CLASS_NAME[]; -extern WCHAR STRING_PROGRAM_WIN_CLASS_NAME[]; +extern const WCHAR STRING_MAIN_WIN_CLASS_NAME[]; +extern const WCHAR STRING_MDI_WIN_CLASS_NAME[]; +extern const WCHAR STRING_GROUP_WIN_CLASS_NAME[]; +extern const WCHAR STRING_PROGRAM_WIN_CLASS_NAME[]; /* Resource names */ #define IDD_MAIN 1 diff --git a/programs/progman/string.c b/programs/progman/string.c index fb27b54a55c..6a78bf3a988 100644 --- a/programs/progman/string.c +++ b/programs/progman/string.c @@ -26,10 +26,10 @@ /* Class names */ -WCHAR STRING_MAIN_WIN_CLASS_NAME[] = {'P','M','M','a','i','n',0}; -WCHAR STRING_MDI_WIN_CLASS_NAME[] = {'M','D','I','C','L','I','E','N','T',0}; -WCHAR STRING_GROUP_WIN_CLASS_NAME[] = {'P','M','G','r','o','u','p',0}; -WCHAR STRING_PROGRAM_WIN_CLASS_NAME[] = {'P','M','P','r','o','g','r','a','m',0}; +const WCHAR STRING_MAIN_WIN_CLASS_NAME[] = L"PMMain"; +const WCHAR STRING_MDI_WIN_CLASS_NAME[] = L"MDICLIENT"; +const WCHAR STRING_GROUP_WIN_CLASS_NAME[] = L"PMGroup"; +const WCHAR STRING_PROGRAM_WIN_CLASS_NAME[] = L"PMProgram"; VOID STRING_LoadMenus(VOID) { -- 2.26.2

1 0

[PATCH] regsvr32: Use wide-char string literals.
by Michael Stefaniuc 07 Oct '20

07 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regsvr32/regsvr32.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 730f1fef3dd..be21ac17953 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -114,9 +114,7 @@ static LPCWSTR find_arg_start(LPCWSTR cmdline) static void reexec_self(void) { /* restart current process as 32-bit or 64-bit with same command line */ - static const WCHAR exe_name[] = {'\\','r','e','g','s','v','r','3','2','.','e','x','e',0}; #ifndef _WIN64 - static const WCHAR sysnative[] = {'\\','S','y','s','N','a','t','i','v','e',0}; BOOL wow64; #endif WCHAR systemdir[MAX_PATH]; @@ -138,16 +136,16 @@ static void reexec_self(void) } GetWindowsDirectoryW(systemdir, MAX_PATH); - wcscat(systemdir, sysnative); + wcscat(systemdir, L"\\SysNative"); #endif args = find_arg_start(GetCommandLineW()); cmdline = HeapAlloc(GetProcessHeap(), 0, - (wcslen(systemdir)+wcslen(exe_name)+wcslen(args)+1)*sizeof(WCHAR)); + (wcslen(systemdir)+wcslen(L"\regsvr32.exe")+wcslen(args)+1)*sizeof(WCHAR)); wcscpy(cmdline, systemdir); - wcscat(cmdline, exe_name); + wcscat(cmdline, L"\regsvr32.exe"); wcscat(cmdline, args); si.cb = sizeof(si); -- 2.26.2

1 0

[PATCH] avifil32: Use wide-char string literals.
by Michael Stefaniuc 07 Oct '20

07 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/avifil32/api.c | 19 ++++++------------- dlls/avifil32/avifile.c | 7 ++----- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index a7f84ba3bce..5a9985424e7 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -994,11 +994,7 @@ HRESULT WINAPI AVIBuildFilterA(LPSTR szFilter, LONG cbFilter, BOOL fSaving) */ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) { - static const WCHAR all_files[] = { '*','.','*',0,0 }; - static const WCHAR szClsid[] = {'C','L','S','I','D',0}; - static const WCHAR szExtensionFmt[] = {';','*','.','%','s',0}; - static const WCHAR szAVIFileExtensions[] = - {'A','V','I','F','i','l','e','\\','E','x','t','e','n','s','i','o','n','s',0}; + static const WCHAR all_files[] = L"*.*\0"; AVIFilter *lp; WCHAR szAllFiles[40]; @@ -1030,7 +1026,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) * First filter is named "All multimedia files" and its filter is a * collection of all possible extensions except "*.*". */ - if (RegOpenKeyW(HKEY_CLASSES_ROOT, szAVIFileExtensions, &hKey) != ERROR_SUCCESS) { + if (RegOpenKeyW(HKEY_CLASSES_ROOT, L"AVIFile\\Extensions", &hKey) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, lp); return AVIERR_ERROR; } @@ -1065,7 +1061,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) } /* append extension to the filter */ - wsprintfW(szValue, szExtensionFmt, szFileExt); + wsprintfW(szValue, L";*.%s", szFileExt); if (lp[i].szExtensions[0] == 0) lstrcatW(lp[i].szExtensions, szValue + 1); else @@ -1080,7 +1076,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) RegCloseKey(hKey); /* 2. get descriptions for the CLSIDs and fill out szFilter */ - if (RegOpenKeyW(HKEY_CLASSES_ROOT, szClsid, &hKey) != ERROR_SUCCESS) { + if (RegOpenKeyW(HKEY_CLASSES_ROOT, L"CLSID", &hKey) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, lp); return AVIERR_ERROR; } @@ -1254,9 +1250,6 @@ static BOOL AVISaveOptionsFmtChoose(HWND hWnd) static void AVISaveOptionsUpdate(HWND hWnd) { - static const WCHAR szVideoFmt[]={'%','l','d','x','%','l','d','x','%','d',0}; - static const WCHAR szAudioFmt[]={'%','s',' ','%','s',0}; - WCHAR szFormat[128]; AVISTREAMINFOW sInfo; LPVOID lpFormat; @@ -1283,7 +1276,7 @@ static void AVISaveOptionsUpdate(HWND hWnd) LPBITMAPINFOHEADER lpbi = lpFormat; ICINFO icinfo; - wsprintfW(szFormat, szVideoFmt, lpbi->biWidth, + wsprintfW(szFormat, L"%ldx%ldx%d", lpbi->biWidth, lpbi->biHeight, lpbi->biBitCount); if (lpbi->biCompression != BI_RGB) { @@ -1320,7 +1313,7 @@ static void AVISaveOptionsUpdate(HWND hWnd) if (acmFormatTagDetailsW(NULL, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG) == S_OK) { if (acmFormatDetailsW(NULL,&afd,ACM_FORMATDETAILSF_FORMAT) == S_OK) - wsprintfW(szFormat, szAudioFmt, afd.szFormat, aftd.szFormatTag); + wsprintfW(szFormat, L"%s %s", afd.szFormat, aftd.szFormatTag); } } } diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index f3cf484d91f..b1654daa690 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1714,9 +1714,6 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) break; case ckidSTREAMHEADER: { - static const WCHAR streamTypeFmt[] = {'%','4','.','4','h','s',0}; - static const WCHAR streamNameFmt[] = {'%','s',' ','%','s',' ','#','%','d',0}; - AVIStreamHeader streamHdr; WCHAR szType[25]; UINT count; @@ -1754,7 +1751,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) else if (streamHdr.fccType == streamtypeAUDIO) LoadStringW(AVIFILE_hModule, IDS_AUDIO, szType, ARRAY_SIZE(szType)); else - wsprintfW(szType, streamTypeFmt, (char*)&streamHdr.fccType); + wsprintfW(szType, L"%4.4hs", (char*)&streamHdr.fccType); /* get count of this streamtype up to this stream */ count = 0; @@ -1766,7 +1763,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) memset(pStream->sInfo.szName, 0, sizeof(pStream->sInfo.szName)); /* FIXME: avoid overflow -- better use wsnprintfW, which doesn't exists ! */ - wsprintfW(pStream->sInfo.szName, streamNameFmt, + wsprintfW(pStream->sInfo.szName, L"%s %s #%d", AVIFILE_BasenameW(This->szFileName), szType, count); } break; -- 2.26.2

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 07 Oct '20

07 Oct '20

2 1

[PATCH] gdi32: Allow any mode passed to SetBkMode().
by Jeff Smith 07 Oct '20

07 Oct '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- Testing revealed that SetBkMode() does not treat 'invalid' values as one might assume. Discovered this when working on another issue. Note that fixing this to match Windows simplifies one of the tests for that bug. dlls/gdi32/dc.c | 12 ++---------- dlls/gdi32/tests/dc.c | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 230f1949e8d..0bac9c27d16 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1598,20 +1598,12 @@ INT WINAPI SetBkMode( HDC hdc, INT mode ) INT ret = 0; DC *dc; - if ((mode <= 0) || (mode > BKMODE_LAST)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } if ((dc = get_dc_ptr( hdc ))) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetBkMode ); mode = physdev->funcs->pSetBkMode( physdev, mode ); - if (mode) - { - ret = dc->backgroundMode; - dc->backgroundMode = mode; - } + ret = dc->backgroundMode; + dc->backgroundMode = mode; release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index b4a89b213d2..ce9fca1653f 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -40,7 +40,7 @@ static void test_dc_values(void) { HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); COLORREF color; - int extra; + int extra, mode; ok( hdc != NULL, "CreateDC failed\n" ); color = SetBkColor( hdc, 0x12345678 ); @@ -81,6 +81,23 @@ static void test_dc_values(void) extra = GetTextCharacterExtra( hdc ); ok( extra == 123, "initial extra %d\n", extra ); + mode = SetBkMode( hdc, TRANSPARENT ); + ok( mode == OPAQUE, "initial mode %08x\n", mode ); + mode = GetBkMode( hdc ); + ok( mode == TRANSPARENT, "wrong mode %08x\n", mode ); + mode = SetBkMode( hdc, OPAQUE ); + ok( mode == TRANSPARENT, "wrong mode %08x\n", mode ); + mode = GetBkMode( hdc ); + ok( mode == OPAQUE, "wrong mode %08x\n", mode ); + mode = SetBkMode( hdc, 0 ); + ok( mode == OPAQUE, "wrong mode %08x\n", mode ); + mode = GetBkMode( hdc ); + ok( mode == 0, "wrong mode %08x\n", mode ); + mode = SetBkMode( hdc, BKMODE_LAST + 1 ); + ok( mode == 0, "wrong mode %08x\n", mode ); + mode = GetBkMode( hdc ); + ok( mode == BKMODE_LAST + 1, "wrong mode %08x\n", mode ); + DeleteDC( hdc ); } -- 2.23.0

3 4

[PATCH v2 5/5] amstream: Reference the multimedia stream in ddraw stream sample.
by Anton Baskanov 07 Oct '20

07 Oct '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/ddrawstream.c | 6 ++++++ dlls/amstream/tests/amstream.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 6ea99d4915e..5e6e1555d7c 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -70,6 +70,7 @@ struct ddraw_sample IDirectDrawStreamSample IDirectDrawStreamSample_iface; LONG ref; struct ddraw_stream *parent; + IMultiMediaStream *mmstream; IDirectDrawSurface *surface; RECT rect; STREAM_TIME start_time; @@ -1462,6 +1463,8 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) --sample->parent->sample_refs; LeaveCriticalSection(&sample->parent->cs); + if (sample->mmstream) + IMultiMediaStream_Release(sample->mmstream); IAMMediaStream_Release(&sample->parent->IAMMediaStream_iface); if (sample->surface) @@ -1678,8 +1681,11 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; object->parent = parent; + object->mmstream = parent->parent; InitializeConditionVariable(&object->update_cv); IAMMediaStream_AddRef(&parent->IAMMediaStream_iface); + if (object->mmstream) + IMultiMediaStream_AddRef(object->mmstream); ++parent->sample_refs; if (surface) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 285dc0f0547..9dda5882a4f 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -6904,9 +6904,11 @@ static void test_ddrawstream_create_sample(void) hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, &rect, 0, &sample); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + EXPECT_REF(mmstream, 1); EXPECT_REF(stream, 3); hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(mmstream, 2); EXPECT_REF(stream, 4); hr = IDirectDrawStreamSample_GetSurface(sample, NULL, NULL); -- 2.17.1

2 1

[PATCH vkd3d 1/3] vkd3d-compiler: Do not validate the target type if --print-target-types is specified.
by Henri Verbeet 07 Oct '20

07 Oct '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 0b89ba86..7a1a5b0b 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -474,6 +474,9 @@ static bool parse_command_line(int argc, char **argv, struct options *options) } } + if (options->print_target_types) + return true; + if (!validate_target_type(options->source_type, options->target_type)) { fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n", @@ -482,9 +485,6 @@ static bool parse_command_line(int argc, char **argv, struct options *options) return false; } - if (options->print_target_types) - return true; - if (optind < argc) options->filename = argv[argc - 1]; -- 2.11.0

2 1

[PATCH vkd3d 3/3] include: Add the D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE enumeration.
by Henri Verbeet 07 Oct '20

07 Oct '20

From: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_d3d12sdklayers.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/vkd3d_d3d12sdklayers.idl b/include/vkd3d_d3d12sdklayers.idl index 31187f7e..027eeaa2 100644 --- a/include/vkd3d_d3d12sdklayers.idl +++ b/include/vkd3d_d3d12sdklayers.idl @@ -890,6 +890,15 @@ typedef enum D3D12_MESSAGE_ID D3D12_MESSAGE_ID_D3D12_MESSAGES_END } D3D12_MESSAGE_ID; +typedef enum D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE +{ + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_NONE = 0x0, + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_STATE_TRACKING_ONLY = 0x1, + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_UNGUARDED_VALIDATION = 0x2, + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_GUARDED_VALIDATION = 0x3, + NUM_D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODES = 0x4, +} D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE; + typedef struct D3D12_MESSAGE { D3D12_MESSAGE_CATEGORY Category; -- 2.11.0

1 0

[PATCH vkd3d 2/3] include: Add the ID3D12InfoQueue interface.
by Henri Verbeet 07 Oct '20

07 Oct '20

From: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 194128. include/vkd3d_d3d12sdklayers.idl | 943 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 943 insertions(+) diff --git a/include/vkd3d_d3d12sdklayers.idl b/include/vkd3d_d3d12sdklayers.idl index 76634628..31187f7e 100644 --- a/include/vkd3d_d3d12sdklayers.idl +++ b/include/vkd3d_d3d12sdklayers.idl @@ -18,6 +18,903 @@ import "vkd3d_d3d12.idl"; +typedef enum D3D12_MESSAGE_CATEGORY +{ + D3D12_MESSAGE_CATEGORY_APPLICATION_DEFINED = 0x0, + D3D12_MESSAGE_CATEGORY_MISCELLANEOUS = 0x1, + D3D12_MESSAGE_CATEGORY_INITIALIZATION = 0x2, + D3D12_MESSAGE_CATEGORY_CLEANUP = 0x3, + D3D12_MESSAGE_CATEGORY_COMPILATION = 0x4, + D3D12_MESSAGE_CATEGORY_STATE_CREATION = 0x5, + D3D12_MESSAGE_CATEGORY_STATE_SETTING = 0x6, + D3D12_MESSAGE_CATEGORY_STATE_GETTING = 0x7, + D3D12_MESSAGE_CATEGORY_RESOURCE_MANIPULATION = 0x8, + D3D12_MESSAGE_CATEGORY_EXECUTION = 0x9, + D3D12_MESSAGE_CATEGORY_SHADER = 0xa, +} D3D12_MESSAGE_CATEGORY; + +typedef enum D3D12_MESSAGE_SEVERITY +{ + D3D12_MESSAGE_SEVERITY_CORRUPTION = 0x0, + D3D12_MESSAGE_SEVERITY_ERROR = 0x1, + D3D12_MESSAGE_SEVERITY_WARNING = 0x2, + D3D12_MESSAGE_SEVERITY_INFO = 0x3, + D3D12_MESSAGE_SEVERITY_MESSAGE = 0x4, +} D3D12_MESSAGE_SEVERITY; + +typedef enum D3D12_MESSAGE_ID +{ + D3D12_MESSAGE_ID_UNKNOWN = 0x0000, + D3D12_MESSAGE_ID_STRING_FROM_APPLICATION = 0x0001, + D3D12_MESSAGE_ID_CORRUPTED_THIS = 0x0002, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER1 = 0x0003, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER2 = 0x0004, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER3 = 0x0005, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER4 = 0x0006, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER5 = 0x0007, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER6 = 0x0008, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER7 = 0x0009, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER8 = 0x000a, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER9 = 0x000b, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER10 = 0x000c, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER11 = 0x000d, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER12 = 0x000e, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER13 = 0x000f, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER14 = 0x0010, + D3D12_MESSAGE_ID_CORRUPTED_PARAMETER15 = 0x0011, + D3D12_MESSAGE_ID_CORRUPTED_MULTITHREADING = 0x0012, + D3D12_MESSAGE_ID_MESSAGE_REPORTING_OUTOFMEMORY = 0x0013, + D3D12_MESSAGE_ID_GETPRIVATEDATA_MOREDATA = 0x0014, + D3D12_MESSAGE_ID_SETPRIVATEDATA_INVALIDFREEDATA = 0x0015, + D3D12_MESSAGE_ID_SETPRIVATEDATA_CHANGINGPARAMS = 0x0018, + D3D12_MESSAGE_ID_SETPRIVATEDATA_OUTOFMEMORY = 0x0019, + D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_UNRECOGNIZEDFORMAT = 0x001a, + D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDDESC = 0x001b, + D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDFORMAT = 0x001c, + D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDVIDEOPLANESLICE = 0x001d, + D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDPLANESLICE = 0x001e, + D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDDIMENSIONS = 0x001f, + D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDRESOURCE = 0x0020, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_UNRECOGNIZEDFORMAT = 0x0023, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_UNSUPPORTEDFORMAT = 0x0024, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDDESC = 0x0025, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDFORMAT = 0x0026, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDVIDEOPLANESLICE = 0x0027, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDPLANESLICE = 0x0028, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDDIMENSIONS = 0x0029, + D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDRESOURCE = 0x002a, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_UNRECOGNIZEDFORMAT = 0x002d, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDDESC = 0x002e, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDFORMAT = 0x002f, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDDIMENSIONS = 0x0030, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDRESOURCE = 0x0031, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_OUTOFMEMORY = 0x0034, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_TOOMANYELEMENTS = 0x0035, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDFORMAT = 0x0036, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INCOMPATIBLEFORMAT = 0x0037, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDSLOT = 0x0038, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDINPUTSLOTCLASS = 0x0039, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_STEPRATESLOTCLASSMISMATCH = 0x003a, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDSLOTCLASSCHANGE = 0x003b, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDSTEPRATECHANGE = 0x003c, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDALIGNMENT = 0x003d, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_DUPLICATESEMANTIC = 0x003e, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_UNPARSEABLEINPUTSIGNATURE = 0x003f, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_NULLSEMANTIC = 0x0040, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_MISSINGELEMENT = 0x0041, + D3D12_MESSAGE_ID_CREATEVERTEXSHADER_OUTOFMEMORY = 0x0042, + D3D12_MESSAGE_ID_CREATEVERTEXSHADER_INVALIDSHADERBYTECODE = 0x0043, + D3D12_MESSAGE_ID_CREATEVERTEXSHADER_INVALIDSHADERTYPE = 0x0044, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_OUTOFMEMORY = 0x0045, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_INVALIDSHADERBYTECODE = 0x0046, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_INVALIDSHADERTYPE = 0x0047, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_OUTOFMEMORY = 0x0048, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSHADERBYTECODE = 0x0049, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSHADERTYPE = 0x004a, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDNUMENTRIES = 0x004b, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_OUTPUTSTREAMSTRIDEUNUSED = 0x004c, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_OUTPUTSLOT0EXPECTED = 0x004f, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDOUTPUTSLOT = 0x0050, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_ONLYONEELEMENTPERSLOT = 0x0051, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDCOMPONENTCOUNT = 0x0052, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSTARTCOMPONENTANDCOMPONENTCOUNT = 0x0053, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDGAPDEFINITION = 0x0054, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_REPEATEDOUTPUT = 0x0055, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDOUTPUTSTREAMSTRIDE = 0x0056, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_MISSINGSEMANTIC = 0x0057, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_MASKMISMATCH = 0x0058, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_CANTHAVEONLYGAPS = 0x0059, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_DECLTOOCOMPLEX = 0x005a, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_MISSINGOUTPUTSIGNATURE = 0x005b, + D3D12_MESSAGE_ID_CREATEPIXELSHADER_OUTOFMEMORY = 0x005c, + D3D12_MESSAGE_ID_CREATEPIXELSHADER_INVALIDSHADERBYTECODE = 0x005d, + D3D12_MESSAGE_ID_CREATEPIXELSHADER_INVALIDSHADERTYPE = 0x005e, + D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDFILLMODE = 0x005f, + D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDCULLMODE = 0x0060, + D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDDEPTHBIASCLAMP = 0x0061, + D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDSLOPESCALEDDEPTHBIAS = 0x0062, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDDEPTHWRITEMASK = 0x0064, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDDEPTHFUNC = 0x0065, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILFAILOP = 0x0066, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILZFAILOP = 0x0067, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILPASSOP = 0x0068, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILFUNC = 0x0069, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILFAILOP = 0x006a, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILZFAILOP = 0x006b, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILPASSOP = 0x006c, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILFUNC = 0x006d, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDSRCBLEND = 0x006f, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDDESTBLEND = 0x0070, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDBLENDOP = 0x0071, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDSRCBLENDALPHA = 0x0072, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDDESTBLENDALPHA = 0x0073, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDBLENDOPALPHA = 0x0074, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDRENDERTARGETWRITEMASK = 0x0075, + D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_INVALID = 0x0087, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_ROOT_SIGNATURE_NOT_SET = 0x00c8, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_ROOT_SIGNATURE_MISMATCH = 0x00c9, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_BUFFER_NOT_SET = 0x00ca, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_BUFFER_STRIDE_TOO_SMALL = 0x00d1, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_BUFFER_TOO_SMALL = 0x00d2, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_BUFFER_NOT_SET = 0x00d3, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_BUFFER_FORMAT_INVALID = 0x00d4, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_BUFFER_TOO_SMALL = 0x00d5, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INVALID_PRIMITIVETOPOLOGY = 0x00db, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_STRIDE_UNALIGNED = 0x00dd, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_OFFSET_UNALIGNED = 0x00de, + D3D12_MESSAGE_ID_DEVICE_REMOVAL_PROCESS_AT_FAULT = 0x00e8, + D3D12_MESSAGE_ID_DEVICE_REMOVAL_PROCESS_POSSIBLY_AT_FAULT = 0x00e9, + D3D12_MESSAGE_ID_DEVICE_REMOVAL_PROCESS_NOT_AT_FAULT = 0x00ea, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_TRAILING_DIGIT_IN_SEMANTIC = 0x00ef, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_TRAILING_DIGIT_IN_SEMANTIC = 0x00f0, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_TYPE_MISMATCH = 0x00f5, + D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_EMPTY_LAYOUT = 0x00fd, + D3D12_MESSAGE_ID_LIVE_OBJECT_SUMMARY = 0x00ff, + D3D12_MESSAGE_ID_LIVE_DEVICE = 0x0112, + D3D12_MESSAGE_ID_LIVE_SWAPCHAIN = 0x0113, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDFLAGS = 0x0114, + D3D12_MESSAGE_ID_CREATEVERTEXSHADER_INVALIDCLASSLINKAGE = 0x0115, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_INVALIDCLASSLINKAGE = 0x0116, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSTREAMTORASTERIZER = 0x0118, + D3D12_MESSAGE_ID_CREATEPIXELSHADER_INVALIDCLASSLINKAGE = 0x011b, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSTREAM = 0x011c, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UNEXPECTEDENTRIES = 0x011d, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UNEXPECTEDSTRIDES = 0x011e, + D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDNUMSTRIDES = 0x011f, + D3D12_MESSAGE_ID_CREATEHULLSHADER_OUTOFMEMORY = 0x0121, + D3D12_MESSAGE_ID_CREATEHULLSHADER_INVALIDSHADERBYTECODE = 0x0122, + D3D12_MESSAGE_ID_CREATEHULLSHADER_INVALIDSHADERTYPE = 0x0123, + D3D12_MESSAGE_ID_CREATEHULLSHADER_INVALIDCLASSLINKAGE = 0x0124, + D3D12_MESSAGE_ID_CREATEDOMAINSHADER_OUTOFMEMORY = 0x0126, + D3D12_MESSAGE_ID_CREATEDOMAINSHADER_INVALIDSHADERBYTECODE = 0x0127, + D3D12_MESSAGE_ID_CREATEDOMAINSHADER_INVALIDSHADERTYPE = 0x0128, + D3D12_MESSAGE_ID_CREATEDOMAINSHADER_INVALIDCLASSLINKAGE = 0x0129, + D3D12_MESSAGE_ID_RESOURCE_UNMAP_NOTMAPPED = 0x0136, + D3D12_MESSAGE_ID_DEVICE_CHECKFEATURESUPPORT_MISMATCHED_DATA_SIZE = 0x013e, + D3D12_MESSAGE_ID_CREATECOMPUTESHADER_OUTOFMEMORY = 0x0141, + D3D12_MESSAGE_ID_CREATECOMPUTESHADER_INVALIDSHADERBYTECODE = 0x0142, + D3D12_MESSAGE_ID_CREATECOMPUTESHADER_INVALIDCLASSLINKAGE = 0x0143, + D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 0x014b, + D3D12_MESSAGE_ID_DEVICE_CREATEHULLSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 0x014c, + D3D12_MESSAGE_ID_DEVICE_CREATEDOMAINSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 0x014d, + D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 0x014e, + D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_DOUBLEFLOATOPSNOTSUPPORTED = 0x014f, + D3D12_MESSAGE_ID_DEVICE_CREATEPIXELSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 0x0150, + D3D12_MESSAGE_ID_DEVICE_CREATECOMPUTESHADER_DOUBLEFLOATOPSNOTSUPPORTED = 0x0151, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDRESOURCE = 0x0154, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDDESC = 0x0155, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDFORMAT = 0x0156, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDVIDEOPLANESLICE = 0x0157, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDPLANESLICE = 0x0158, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDDIMENSIONS = 0x0159, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_UNRECOGNIZEDFORMAT = 0x015a, + D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDFLAGS = 0x0162, + D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDFORCEDSAMPLECOUNT = 0x0191, + D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDLOGICOPS = 0x0193, + D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 0x019a, + D3D12_MESSAGE_ID_DEVICE_CREATEHULLSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 0x019c, + D3D12_MESSAGE_ID_DEVICE_CREATEDOMAINSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 0x019e, + D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 0x01a0, + D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_DOUBLEEXTENSIONSNOTSUPPORTED = 0x01a2, + D3D12_MESSAGE_ID_DEVICE_CREATEPIXELSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 0x01a4, + D3D12_MESSAGE_ID_DEVICE_CREATECOMPUTESHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 0x01a6, + D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_UAVSNOTSUPPORTED = 0x01a9, + D3D12_MESSAGE_ID_DEVICE_CREATEHULLSHADER_UAVSNOTSUPPORTED = 0x01aa, + D3D12_MESSAGE_ID_DEVICE_CREATEDOMAINSHADER_UAVSNOTSUPPORTED = 0x01ab, + D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADER_UAVSNOTSUPPORTED = 0x01ac, + D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UAVSNOTSUPPORTED = 0x01ad, + D3D12_MESSAGE_ID_DEVICE_CREATEPIXELSHADER_UAVSNOTSUPPORTED = 0x01ae, + D3D12_MESSAGE_ID_DEVICE_CREATECOMPUTESHADER_UAVSNOTSUPPORTED = 0x01af, + D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_INVALIDSOURCERECT = 0x01bf, + D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_EMPTYRECT = 0x01c0, + D3D12_MESSAGE_ID_UPDATETILEMAPPINGS_INVALID_PARAMETER = 0x01ed, + D3D12_MESSAGE_ID_COPYTILEMAPPINGS_INVALID_PARAMETER = 0x01ee, + D3D12_MESSAGE_ID_CREATEDEVICE_INVALIDARGS = 0x01fa, + D3D12_MESSAGE_ID_CREATEDEVICE_WARNING = 0x01fb, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_TYPE = 0x0207, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_NULL_POINTER = 0x0208, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_SUBRESOURCE = 0x0209, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_RESERVED_BITS = 0x020a, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISSING_BIND_FLAGS = 0x020b, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISMATCHING_MISC_FLAGS = 0x020c, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_MATCHING_STATES = 0x020d, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_COMBINATION = 0x020e, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_BEFORE_AFTER_MISMATCH = 0x020f, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_RESOURCE = 0x0210, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_SAMPLE_COUNT = 0x0211, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_FLAGS = 0x0212, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_COMBINED_FLAGS = 0x0213, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_FLAGS_FOR_FORMAT = 0x0214, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_SPLIT_BARRIER = 0x0215, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_UNMATCHED_END = 0x0216, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_UNMATCHED_BEGIN = 0x0217, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_FLAG = 0x0218, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_COMMAND_LIST_TYPE = 0x0219, + D3D12_MESSAGE_ID_INVALID_SUBRESOURCE_STATE = 0x021a, + D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_CONTENTION = 0x021c, + D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_RESET = 0x021d, + D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_RESET_BUNDLE = 0x021e, + D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_CANNOT_RESET = 0x021f, + D3D12_MESSAGE_ID_COMMAND_LIST_OPEN = 0x0220, + D3D12_MESSAGE_ID_INVALID_BUNDLE_API = 0x0222, + D3D12_MESSAGE_ID_COMMAND_LIST_CLOSED = 0x0223, + D3D12_MESSAGE_ID_WRONG_COMMAND_ALLOCATOR_TYPE = 0x0225, + D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_SYNC = 0x0228, + D3D12_MESSAGE_ID_COMMAND_LIST_SYNC = 0x0229, + D3D12_MESSAGE_ID_SET_DESCRIPTOR_HEAP_INVALID = 0x022a, + D3D12_MESSAGE_ID_CREATE_COMMANDQUEUE = 0x022d, + D3D12_MESSAGE_ID_CREATE_COMMANDALLOCATOR = 0x022e, + D3D12_MESSAGE_ID_CREATE_PIPELINESTATE = 0x022f, + D3D12_MESSAGE_ID_CREATE_COMMANDLIST12 = 0x0230, + D3D12_MESSAGE_ID_CREATE_RESOURCE = 0x0232, + D3D12_MESSAGE_ID_CREATE_DESCRIPTORHEAP = 0x0233, + D3D12_MESSAGE_ID_CREATE_ROOTSIGNATURE = 0x0234, + D3D12_MESSAGE_ID_CREATE_LIBRARY = 0x0235, + D3D12_MESSAGE_ID_CREATE_HEAP = 0x0236, + D3D12_MESSAGE_ID_CREATE_MONITOREDFENCE = 0x0237, + D3D12_MESSAGE_ID_CREATE_QUERYHEAP = 0x0238, + D3D12_MESSAGE_ID_CREATE_COMMANDSIGNATURE = 0x0239, + D3D12_MESSAGE_ID_LIVE_COMMANDQUEUE = 0x023a, + D3D12_MESSAGE_ID_LIVE_COMMANDALLOCATOR = 0x023b, + D3D12_MESSAGE_ID_LIVE_PIPELINESTATE = 0x023c, + D3D12_MESSAGE_ID_LIVE_COMMANDLIST12 = 0x023d, + D3D12_MESSAGE_ID_LIVE_RESOURCE = 0x023f, + D3D12_MESSAGE_ID_LIVE_DESCRIPTORHEAP = 0x0240, + D3D12_MESSAGE_ID_LIVE_ROOTSIGNATURE = 0x0241, + D3D12_MESSAGE_ID_LIVE_LIBRARY = 0x0242, + D3D12_MESSAGE_ID_LIVE_HEAP = 0x0243, + D3D12_MESSAGE_ID_LIVE_MONITOREDFENCE = 0x0244, + D3D12_MESSAGE_ID_LIVE_QUERYHEAP = 0x0245, + D3D12_MESSAGE_ID_LIVE_COMMANDSIGNATURE = 0x0246, + D3D12_MESSAGE_ID_DESTROY_COMMANDQUEUE = 0x0247, + D3D12_MESSAGE_ID_DESTROY_COMMANDALLOCATOR = 0x0248, + D3D12_MESSAGE_ID_DESTROY_PIPELINESTATE = 0x0249, + D3D12_MESSAGE_ID_DESTROY_COMMANDLIST12 = 0x024a, + D3D12_MESSAGE_ID_DESTROY_RESOURCE = 0x024c, + D3D12_MESSAGE_ID_DESTROY_DESCRIPTORHEAP = 0x024d, + D3D12_MESSAGE_ID_DESTROY_ROOTSIGNATURE = 0x024e, + D3D12_MESSAGE_ID_DESTROY_LIBRARY = 0x024f, + D3D12_MESSAGE_ID_DESTROY_HEAP = 0x0250, + D3D12_MESSAGE_ID_DESTROY_MONITOREDFENCE = 0x0251, + D3D12_MESSAGE_ID_DESTROY_QUERYHEAP = 0x0252, + D3D12_MESSAGE_ID_DESTROY_COMMANDSIGNATURE = 0x0253, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDDIMENSIONS = 0x0255, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDMISCFLAGS = 0x0257, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDARG_RETURN = 0x025a, + D3D12_MESSAGE_ID_CREATERESOURCE_OUTOFMEMORY_RETURN = 0x025b, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDDESC = 0x025c, + D3D12_MESSAGE_ID_POSSIBLY_INVALID_SUBRESOURCE_STATE = 0x025f, + D3D12_MESSAGE_ID_INVALID_USE_OF_NON_RESIDENT_RESOURCE = 0x0260, + D3D12_MESSAGE_ID_POSSIBLE_INVALID_USE_OF_NON_RESIDENT_RESOURCE = 0x0261, + D3D12_MESSAGE_ID_BUNDLE_PIPELINE_STATE_MISMATCH = 0x0262, + D3D12_MESSAGE_ID_PRIMITIVE_TOPOLOGY_MISMATCH_PIPELINE_STATE = 0x0263, + D3D12_MESSAGE_ID_RENDER_TARGET_FORMAT_MISMATCH_PIPELINE_STATE = 0x0265, + D3D12_MESSAGE_ID_RENDER_TARGET_SAMPLE_DESC_MISMATCH_PIPELINE_STATE = 0x0266, + D3D12_MESSAGE_ID_DEPTH_STENCIL_FORMAT_MISMATCH_PIPELINE_STATE = 0x0267, + D3D12_MESSAGE_ID_DEPTH_STENCIL_SAMPLE_DESC_MISMATCH_PIPELINE_STATE = 0x0268, + D3D12_MESSAGE_ID_CREATESHADER_INVALIDBYTECODE = 0x026e, + D3D12_MESSAGE_ID_CREATEHEAP_NULLDESC = 0x026f, + D3D12_MESSAGE_ID_CREATEHEAP_INVALIDSIZE = 0x0270, + D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDHEAPTYPE = 0x0271, + D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDCPUPAGEPROPERTIES = 0x0272, + D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDMEMORYPOOL = 0x0273, + D3D12_MESSAGE_ID_CREATEHEAP_INVALIDPROPERTIES = 0x0274, + D3D12_MESSAGE_ID_CREATEHEAP_INVALIDALIGNMENT = 0x0275, + D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDMISCFLAGS = 0x0276, + D3D12_MESSAGE_ID_CREATEHEAP_INVALIDMISCFLAGS = 0x0277, + D3D12_MESSAGE_ID_CREATEHEAP_INVALIDARG_RETURN = 0x0278, + D3D12_MESSAGE_ID_CREATEHEAP_OUTOFMEMORY_RETURN = 0x0279, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_NULLHEAPPROPERTIES = 0x027a, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDHEAPTYPE = 0x027b, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDCPUPAGEPROPERTIES = 0x027c, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDMEMORYPOOL = 0x027d, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_INVALIDHEAPPROPERTIES = 0x027e, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDHEAPMISCFLAGS = 0x027f, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_INVALIDHEAPMISCFLAGS = 0x0280, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_INVALIDARG_RETURN = 0x0281, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_OUTOFMEMORY_RETURN = 0x0282, + D3D12_MESSAGE_ID_GETCUSTOMHEAPPROPERTIES_UNRECOGNIZEDHEAPTYPE = 0x0283, + D3D12_MESSAGE_ID_GETCUSTOMHEAPPROPERTIES_INVALIDHEAPTYPE = 0x0284, + D3D12_MESSAGE_ID_CREATE_DESCRIPTOR_HEAP_INVALID_DESC = 0x0285, + D3D12_MESSAGE_ID_INVALID_DESCRIPTOR_HANDLE = 0x0286, + D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALID_CONSERVATIVERASTERMODE = 0x0287, + D3D12_MESSAGE_ID_CREATE_CONSTANT_BUFFER_VIEW_INVALID_RESOURCE = 0x0289, + D3D12_MESSAGE_ID_CREATE_CONSTANT_BUFFER_VIEW_INVALID_DESC = 0x028a, + D3D12_MESSAGE_ID_CREATE_UNORDEREDACCESS_VIEW_INVALID_COUNTER_USAGE = 0x028c, + D3D12_MESSAGE_ID_COPY_DESCRIPTORS_INVALID_RANGES = 0x028d, + D3D12_MESSAGE_ID_COPY_DESCRIPTORS_WRITE_ONLY_DESCRIPTOR = 0x028e, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_RTV_FORMAT_NOT_UNKNOWN = 0x028f, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_RENDER_TARGET_COUNT = 0x0290, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_VERTEX_SHADER_NOT_SET = 0x0291, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INPUTLAYOUT_NOT_SET = 0x0292, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_HS_DS_SIGNATURE_MISMATCH = 0x0293, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_REGISTERINDEX = 0x0294, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_COMPONENTTYPE = 0x0295, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_REGISTERMASK = 0x0296, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_SYSTEMVALUE = 0x0297, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_NEVERWRITTEN_ALWAYSREADS = 0x0298, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_MINPRECISION = 0x0299, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_SEMANTICNAME_NOT_FOUND = 0x029a, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_XOR_DS_MISMATCH = 0x029b, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HULL_SHADER_INPUT_TOPOLOGY_MISMATCH = 0x029c, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_DS_CONTROL_POINT_COUNT_MISMATCH = 0x029d, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_DS_TESSELLATOR_DOMAIN_MISMATCH = 0x029e, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_USE_OF_CENTER_MULTISAMPLE_PATTERN = 0x029f, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_USE_OF_FORCED_SAMPLE_COUNT = 0x02a0, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_PRIMITIVETOPOLOGY = 0x02a1, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_SYSTEMVALUE = 0x02a2, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_OM_DUAL_SOURCE_BLENDING_CAN_ONLY_HAVE_RENDER_TARGET_0 = 0x02a3, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_OM_RENDER_TARGET_DOES_NOT_SUPPORT_BLENDING = 0x02a4, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_PS_OUTPUT_TYPE_MISMATCH = 0x02a5, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_OM_RENDER_TARGET_DOES_NOT_SUPPORT_LOGIC_OPS = 0x02a6, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_RENDERTARGETVIEW_NOT_SET = 0x02a7, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_DEPTHSTENCILVIEW_NOT_SET = 0x02a8, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_GS_INPUT_PRIMITIVE_MISMATCH = 0x02a9, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_POSITION_NOT_PRESENT = 0x02aa, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_MISSING_ROOT_SIGNATURE_FLAGS = 0x02ab, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_INDEX_BUFFER_PROPERTIES = 0x02ac, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_SAMPLE_DESC = 0x02ad, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_ROOT_SIGNATURE_MISMATCH = 0x02ae, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_DS_ROOT_SIGNATURE_MISMATCH = 0x02af, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_VS_ROOT_SIGNATURE_MISMATCH = 0x02b0, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_GS_ROOT_SIGNATURE_MISMATCH = 0x02b1, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_PS_ROOT_SIGNATURE_MISMATCH = 0x02b2, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_MISSING_ROOT_SIGNATURE = 0x02b3, + D3D12_MESSAGE_ID_EXECUTE_BUNDLE_OPEN_BUNDLE = 0x02b4, + D3D12_MESSAGE_ID_EXECUTE_BUNDLE_DESCRIPTOR_HEAP_MISMATCH = 0x02b5, + D3D12_MESSAGE_ID_EXECUTE_BUNDLE_TYPE = 0x02b6, + D3D12_MESSAGE_ID_DRAW_EMPTY_SCISSOR_RECTANGLE = 0x02b7, + D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_BLOB_NOT_FOUND = 0x02b8, + D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_DESERIALIZE_FAILED = 0x02b9, + D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_INVALID_CONFIGURATION = 0x02ba, + D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_NOT_SUPPORTED_ON_DEVICE = 0x02bb, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_NULLRESOURCEPROPERTIES = 0x02bc, + D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_NULLHEAP = 0x02bd, + D3D12_MESSAGE_ID_GETRESOURCEALLOCATIONINFO_INVALIDRDESCS = 0x02be, + D3D12_MESSAGE_ID_MAKERESIDENT_NULLOBJECTARRAY = 0x02bf, + D3D12_MESSAGE_ID_EVICT_NULLOBJECTARRAY = 0x02c1, + D3D12_MESSAGE_ID_SET_DESCRIPTOR_TABLE_INVALID = 0x02c4, + D3D12_MESSAGE_ID_SET_ROOT_CONSTANT_INVALID = 0x02c5, + D3D12_MESSAGE_ID_SET_ROOT_CONSTANT_BUFFER_VIEW_INVALID = 0x02c6, + D3D12_MESSAGE_ID_SET_ROOT_SHADER_RESOURCE_VIEW_INVALID = 0x02c7, + D3D12_MESSAGE_ID_SET_ROOT_UNORDERED_ACCESS_VIEW_INVALID = 0x02c8, + D3D12_MESSAGE_ID_SET_VERTEX_BUFFERS_INVALID_DESC = 0x02c9, + D3D12_MESSAGE_ID_SET_INDEX_BUFFER_INVALID_DESC = 0x02cb, + D3D12_MESSAGE_ID_SET_STREAM_OUTPUT_BUFFERS_INVALID_DESC = 0x02cd, + D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDDIMENSIONALITY = 0x02ce, + D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDLAYOUT = 0x02cf, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDDIMENSIONALITY = 0x02d0, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDALIGNMENT = 0x02d1, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDMIPLEVELS = 0x02d2, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDSAMPLEDESC = 0x02d3, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDLAYOUT = 0x02d4, + D3D12_MESSAGE_ID_SET_INDEX_BUFFER_INVALID = 0x02d5, + D3D12_MESSAGE_ID_SET_VERTEX_BUFFERS_INVALID = 0x02d6, + D3D12_MESSAGE_ID_SET_STREAM_OUTPUT_BUFFERS_INVALID = 0x02d7, + D3D12_MESSAGE_ID_SET_RENDER_TARGETS_INVALID = 0x02d8, + D3D12_MESSAGE_ID_CREATEQUERY_HEAP_INVALID_PARAMETERS = 0x02d9, + D3D12_MESSAGE_ID_BEGIN_END_QUERY_INVALID_PARAMETERS = 0x02db, + D3D12_MESSAGE_ID_CLOSE_COMMAND_LIST_OPEN_QUERY = 0x02dc, + D3D12_MESSAGE_ID_RESOLVE_QUERY_DATA_INVALID_PARAMETERS = 0x02dd, + D3D12_MESSAGE_ID_SET_PREDICATION_INVALID_PARAMETERS = 0x02de, + D3D12_MESSAGE_ID_TIMESTAMPS_NOT_SUPPORTED = 0x02df, + D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDFORMAT = 0x02e1, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDFORMAT = 0x02e2, + D3D12_MESSAGE_ID_GETCOPYABLEFOOTPRINTS_INVALIDSUBRESOURCERANGE = 0x02e3, + D3D12_MESSAGE_ID_GETCOPYABLEFOOTPRINTS_INVALIDBASEOFFSET = 0x02e4, + D3D12_MESSAGE_ID_GETCOPYABLELAYOUT_INVALIDSUBRESOURCERANGE = 0x02e3, + D3D12_MESSAGE_ID_GETCOPYABLELAYOUT_INVALIDBASEOFFSET = 0x02e4, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_HEAP = 0x02e5, + D3D12_MESSAGE_ID_CREATE_SAMPLER_INVALID = 0x02e6, + D3D12_MESSAGE_ID_CREATECOMMANDSIGNATURE_INVALID = 0x02e7, + D3D12_MESSAGE_ID_EXECUTE_INDIRECT_INVALID_PARAMETERS = 0x02e8, + D3D12_MESSAGE_ID_GETGPUVIRTUALADDRESS_INVALID_RESOURCE_DIMENSION = 0x02e9, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDCLEARVALUE = 0x032f, + D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDCLEARVALUEFORMAT = 0x0330, + D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDCLEARVALUEFORMAT = 0x0331, + D3D12_MESSAGE_ID_CREATERESOURCE_CLEARVALUEDENORMFLUSH = 0x0332, + D3D12_MESSAGE_ID_CLEARRENDERTARGETVIEW_MISMATCHINGCLEARVALUE = 0x0334, + D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_MISMATCHINGCLEARVALUE = 0x0335, + D3D12_MESSAGE_ID_MAP_INVALIDHEAP = 0x0336, + D3D12_MESSAGE_ID_UNMAP_INVALIDHEAP = 0x0337, + D3D12_MESSAGE_ID_MAP_INVALIDRESOURCE = 0x0338, + D3D12_MESSAGE_ID_UNMAP_INVALIDRESOURCE = 0x0339, + D3D12_MESSAGE_ID_MAP_INVALIDSUBRESOURCE = 0x033a, + D3D12_MESSAGE_ID_UNMAP_INVALIDSUBRESOURCE = 0x033b, + D3D12_MESSAGE_ID_MAP_INVALIDRANGE = 0x033c, + D3D12_MESSAGE_ID_UNMAP_INVALIDRANGE = 0x033d, + D3D12_MESSAGE_ID_MAP_INVALIDDATAPOINTER = 0x0340, + D3D12_MESSAGE_ID_MAP_INVALIDARG_RETURN = 0x0341, + D3D12_MESSAGE_ID_MAP_OUTOFMEMORY_RETURN = 0x0342, + D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_BUNDLENOTSUPPORTED = 0x0343, + D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_COMMANDLISTMISMATCH = 0x0344, + D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_OPENCOMMANDLIST = 0x0345, + D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_FAILEDCOMMANDLIST = 0x0346, + D3D12_MESSAGE_ID_COPYBUFFERREGION_NULLDST = 0x0347, + D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALIDDSTRESOURCEDIMENSION = 0x0348, + D3D12_MESSAGE_ID_COPYBUFFERREGION_DSTRANGEOUTOFBOUNDS = 0x0349, + D3D12_MESSAGE_ID_COPYBUFFERREGION_NULLSRC = 0x034a, + D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALIDSRCRESOURCEDIMENSION = 0x034b, + D3D12_MESSAGE_ID_COPYBUFFERREGION_SRCRANGEOUTOFBOUNDS = 0x034c, + D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALIDCOPYFLAGS = 0x034d, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_NULLDST = 0x034e, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDDSTTYPE = 0x034f, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTRESOURCEDIMENSION = 0x0350, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTRESOURCE = 0x0351, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTSUBRESOURCE = 0x0352, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTOFFSET = 0x0353, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDDSTFORMAT = 0x0354, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTFORMAT = 0x0355, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTDIMENSIONS = 0x0356, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTROWPITCH = 0x0357, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTPLACEMENT = 0x0358, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTDSPLACEDFOOTPRINTFORMAT = 0x0359, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_DSTREGIONOUTOFBOUNDS = 0x035a, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_NULLSRC = 0x035b, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDSRCTYPE = 0x035c, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCRESOURCEDIMENSION = 0x035d, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCRESOURCE = 0x035e, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCSUBRESOURCE = 0x035f, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCOFFSET = 0x0360, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDSRCFORMAT = 0x0361, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCFORMAT = 0x0362, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCDIMENSIONS = 0x0363, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCROWPITCH = 0x0364, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCPLACEMENT = 0x0365, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCDSPLACEDFOOTPRINTFORMAT = 0x0366, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_SRCREGIONOUTOFBOUNDS = 0x0367, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTCOORDINATES = 0x0368, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCBOX = 0x0369, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_FORMATMISMATCH = 0x036a, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_EMPTYBOX = 0x036b, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDCOPYFLAGS = 0x036c, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALID_SUBRESOURCE_INDEX = 0x036d, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALID_FORMAT = 0x036e, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_RESOURCE_MISMATCH = 0x036f, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALID_SAMPLE_COUNT = 0x0370, + D3D12_MESSAGE_ID_CREATECOMPUTEPIPELINESTATE_INVALID_SHADER = 0x0371, + D3D12_MESSAGE_ID_CREATECOMPUTEPIPELINESTATE_CS_ROOT_SIGNATURE_MISMATCH = 0x0372, + D3D12_MESSAGE_ID_CREATECOMPUTEPIPELINESTATE_MISSING_ROOT_SIGNATURE = 0x0373, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_INVALIDCACHEDBLOB = 0x0374, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBADAPTERMISMATCH = 0x0375, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBDRIVERVERSIONMISMATCH = 0x0376, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBDESCMISMATCH = 0x0377, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBIGNORED = 0x0378, + D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDHEAP = 0x0379, + D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDRESOURCE = 0x037a, + D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDBOX = 0x037b, + D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDSUBRESOURCE = 0x037c, + D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_EMPTYBOX = 0x037d, + D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDHEAP = 0x037e, + D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDRESOURCE = 0x037f, + D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDBOX = 0x0380, + D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDSUBRESOURCE = 0x0381, + D3D12_MESSAGE_ID_READFROMSUBRESOURCE_EMPTYBOX = 0x0382, + D3D12_MESSAGE_ID_TOO_MANY_NODES_SPECIFIED = 0x0383, + D3D12_MESSAGE_ID_INVALID_NODE_INDEX = 0x0384, + D3D12_MESSAGE_ID_GETHEAPPROPERTIES_INVALIDRESOURCE = 0x0385, + D3D12_MESSAGE_ID_NODE_MASK_MISMATCH = 0x0386, + D3D12_MESSAGE_ID_COMMAND_LIST_OUTOFMEMORY = 0x0387, + D3D12_MESSAGE_ID_COMMAND_LIST_MULTIPLE_SWAPCHAIN_BUFFER_REFERENCES = 0x0388, + D3D12_MESSAGE_ID_COMMAND_LIST_TOO_MANY_SWAPCHAIN_REFERENCES = 0x0389, + D3D12_MESSAGE_ID_COMMAND_QUEUE_TOO_MANY_SWAPCHAIN_REFERENCES = 0x038a, + D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_WRONGSWAPCHAINBUFFERREFERENCE = 0x038b, + D3D12_MESSAGE_ID_COMMAND_LIST_SETRENDERTARGETS_INVALIDNUMRENDERTARGETS = 0x038c, + D3D12_MESSAGE_ID_CREATE_QUEUE_INVALID_TYPE = 0x038d, + D3D12_MESSAGE_ID_CREATE_QUEUE_INVALID_FLAGS = 0x038e, + D3D12_MESSAGE_ID_CREATESHAREDRESOURCE_INVALIDFLAGS = 0x038f, + D3D12_MESSAGE_ID_CREATESHAREDRESOURCE_INVALIDFORMAT = 0x0390, + D3D12_MESSAGE_ID_CREATESHAREDHEAP_INVALIDFLAGS = 0x0391, + D3D12_MESSAGE_ID_REFLECTSHAREDPROPERTIES_UNRECOGNIZEDPROPERTIES = 0x0392, + D3D12_MESSAGE_ID_REFLECTSHAREDPROPERTIES_INVALIDSIZE = 0x0393, + D3D12_MESSAGE_ID_REFLECTSHAREDPROPERTIES_INVALIDOBJECT = 0x0394, + D3D12_MESSAGE_ID_KEYEDMUTEX_INVALIDOBJECT = 0x0395, + D3D12_MESSAGE_ID_KEYEDMUTEX_INVALIDKEY = 0x0396, + D3D12_MESSAGE_ID_KEYEDMUTEX_WRONGSTATE = 0x0397, + D3D12_MESSAGE_ID_CREATE_QUEUE_INVALID_PRIORITY = 0x0398, + D3D12_MESSAGE_ID_OBJECT_DELETED_WHILE_STILL_IN_USE = 0x0399, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_INVALID_FLAGS = 0x039a, + D3D12_MESSAGE_ID_HEAP_ADDRESS_RANGE_HAS_NO_RESOURCE = 0x039b, + D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_RENDER_TARGET_DELETED = 0x039c, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_ALL_RENDER_TARGETS_HAVE_UNKNOWN_FORMAT = 0x039d, + D3D12_MESSAGE_ID_HEAP_ADDRESS_RANGE_INTERSECTS_MULTIPLE_BUFFERS = 0x039e, + D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_GPU_WRITTEN_READBACK_RESOURCE_MAPPED = 0x039f, + D3D12_MESSAGE_ID_UNMAP_RANGE_NOT_EMPTY = 0x03a1, + D3D12_MESSAGE_ID_MAP_INVALID_NULLRANGE = 0x03a2, + D3D12_MESSAGE_ID_UNMAP_INVALID_NULLRANGE = 0x03a3, + D3D12_MESSAGE_ID_NO_GRAPHICS_API_SUPPORT = 0x03a4, + D3D12_MESSAGE_ID_NO_COMPUTE_API_SUPPORT = 0x03a5, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_RESOURCE_FLAGS_NOT_SUPPORTED = 0x03a6, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_ROOT_ARGUMENT_UNINITIALIZED = 0x03a7, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_HEAP_INDEX_OUT_OF_BOUNDS = 0x03a8, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_TABLE_REGISTER_INDEX_OUT_OF_BOUNDS = 0x03a9, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_UNINITIALIZED = 0x03aa, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_TYPE_MISMATCH = 0x03ab, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_SRV_RESOURCE_DIMENSION_MISMATCH = 0x03ac, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_UAV_RESOURCE_DIMENSION_MISMATCH = 0x03ad, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_INCOMPATIBLE_RESOURCE_STATE = 0x03ae, + D3D12_MESSAGE_ID_COPYRESOURCE_NULLDST = 0x03af, + D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDDSTRESOURCE = 0x03b0, + D3D12_MESSAGE_ID_COPYRESOURCE_NULLSRC = 0x03b1, + D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDSRCRESOURCE = 0x03b2, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_NULLDST = 0x03b3, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALIDDSTRESOURCE = 0x03b4, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_NULLSRC = 0x03b5, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALIDSRCRESOURCE = 0x03b6, + D3D12_MESSAGE_ID_PIPELINE_STATE_TYPE_MISMATCH = 0x03b7, + D3D12_MESSAGE_ID_COMMAND_LIST_DISPATCH_ROOT_SIGNATURE_NOT_SET = 0x03b8, + D3D12_MESSAGE_ID_COMMAND_LIST_DISPATCH_ROOT_SIGNATURE_MISMATCH = 0x03b9, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_ZERO_BARRIERS = 0x03ba, + D3D12_MESSAGE_ID_BEGIN_END_EVENT_MISMATCH = 0x03bb, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_POSSIBLE_BEFORE_AFTER_MISMATCH = 0x03bc, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISMATCHING_BEGIN_END = 0x03bd, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_INVALID_RESOURCE = 0x03be, + D3D12_MESSAGE_ID_USE_OF_ZERO_REFCOUNT_OBJECT = 0x03bf, + D3D12_MESSAGE_ID_OBJECT_EVICTED_WHILE_STILL_IN_USE = 0x03c0, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_ROOT_DESCRIPTOR_ACCESS_OUT_OF_BOUNDS = 0x03c1, + D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_INVALIDLIBRARYBLOB = 0x03c2, + D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_DRIVERVERSIONMISMATCH = 0x03c3, + D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_ADAPTERVERSIONMISMATCH = 0x03c4, + D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_UNSUPPORTED = 0x03c5, + D3D12_MESSAGE_ID_CREATE_PIPELINELIBRARY = 0x03c6, + D3D12_MESSAGE_ID_LIVE_PIPELINELIBRARY = 0x03c7, + D3D12_MESSAGE_ID_DESTROY_PIPELINELIBRARY = 0x03c8, + D3D12_MESSAGE_ID_STOREPIPELINE_NONAME = 0x03c9, + D3D12_MESSAGE_ID_STOREPIPELINE_DUPLICATENAME = 0x03ca, + D3D12_MESSAGE_ID_LOADPIPELINE_NAMENOTFOUND = 0x03cb, + D3D12_MESSAGE_ID_LOADPIPELINE_INVALIDDESC = 0x03cc, + D3D12_MESSAGE_ID_PIPELINELIBRARY_SERIALIZE_NOTENOUGHMEMORY = 0x03cd, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_PS_OUTPUT_RT_OUTPUT_MISMATCH = 0x03ce, + D3D12_MESSAGE_ID_SETEVENTONMULTIPLEFENCECOMPLETION_INVALIDFLAGS = 0x03cf, + D3D12_MESSAGE_ID_CREATE_QUEUE_VIDEO_NOT_SUPPORTED = 0x03d0, + D3D12_MESSAGE_ID_CREATE_COMMAND_ALLOCATOR_VIDEO_NOT_SUPPORTED = 0x03d1, + D3D12_MESSAGE_ID_CREATEQUERY_HEAP_VIDEO_DECODE_STATISTICS_NOT_SUPPORTED = 0x03d2, + D3D12_MESSAGE_ID_CREATE_VIDEODECODECOMMANDLIST = 0x03d3, + D3D12_MESSAGE_ID_CREATE_VIDEODECODER = 0x03d4, + D3D12_MESSAGE_ID_CREATE_VIDEODECODESTREAM = 0x03d5, + D3D12_MESSAGE_ID_LIVE_VIDEODECODECOMMANDLIST = 0x03d6, + D3D12_MESSAGE_ID_LIVE_VIDEODECODER = 0x03d7, + D3D12_MESSAGE_ID_LIVE_VIDEODECODESTREAM = 0x03d8, + D3D12_MESSAGE_ID_DESTROY_VIDEODECODECOMMANDLIST = 0x03d9, + D3D12_MESSAGE_ID_DESTROY_VIDEODECODER = 0x03da, + D3D12_MESSAGE_ID_DESTROY_VIDEODECODESTREAM = 0x03db, + D3D12_MESSAGE_ID_DECODE_FRAME_INVALID_PARAMETERS = 0x03dc, + D3D12_MESSAGE_ID_DEPRECATED_API = 0x03dd, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISMATCHING_COMMAND_LIST_TYPE = 0x03de, + D3D12_MESSAGE_ID_COMMAND_LIST_DESCRIPTOR_TABLE_NOT_SET = 0x03df, + D3D12_MESSAGE_ID_COMMAND_LIST_ROOT_CONSTANT_BUFFER_VIEW_NOT_SET = 0x03e0, + D3D12_MESSAGE_ID_COMMAND_LIST_ROOT_SHADER_RESOURCE_VIEW_NOT_SET = 0x03e1, + D3D12_MESSAGE_ID_COMMAND_LIST_ROOT_UNORDERED_ACCESS_VIEW_NOT_SET = 0x03e2, + D3D12_MESSAGE_ID_DISCARD_INVALID_SUBRESOURCE_RANGE = 0x03e3, + D3D12_MESSAGE_ID_DISCARD_ONE_SUBRESOURCE_FOR_MIPS_WITH_RECTS = 0x03e4, + D3D12_MESSAGE_ID_DISCARD_NO_RECTS_FOR_NON_TEXTURE2D = 0x03e5, + D3D12_MESSAGE_ID_COPY_ON_SAME_SUBRESOURCE = 0x03e6, + D3D12_MESSAGE_ID_SETRESIDENCYPRIORITY_INVALID_PAGEABLE = 0x03e7, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_UNSUPPORTED = 0x03e8, + D3D12_MESSAGE_ID_STATIC_DESCRIPTOR_INVALID_DESCRIPTOR_CHANGE = 0x03e9, + D3D12_MESSAGE_ID_DATA_STATIC_DESCRIPTOR_INVALID_DATA_CHANGE = 0x03ea, + D3D12_MESSAGE_ID_DATA_STATIC_WHILE_SET_AT_EXECUTE_DESCRIPTOR_INVALID_DATA_CHANGE = 0x03eb, + D3D12_MESSAGE_ID_EXECUTE_BUNDLE_STATIC_DESCRIPTOR_DATA_STATIC_NOT_SET = 0x03ec, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_RESOURCE_ACCESS_OUT_OF_BOUNDS = 0x03ed, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_SAMPLER_MODE_MISMATCH = 0x03ee, + D3D12_MESSAGE_ID_CREATE_FENCE_INVALID_FLAGS = 0x03ef, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_DUPLICATE_SUBRESOURCE_TRANSITIONS = 0x03f0, + D3D12_MESSAGE_ID_SETRESIDENCYPRIORITY_INVALID_PRIORITY = 0x03f1, + D3D12_MESSAGE_ID_CREATE_DESCRIPTOR_HEAP_LARGE_NUM_DESCRIPTORS = 0x03f5, + D3D12_MESSAGE_ID_BEGIN_EVENT = 0x03f6, + D3D12_MESSAGE_ID_END_EVENT = 0x03f7, + D3D12_MESSAGE_ID_CREATEDEVICE_DEBUG_LAYER_STARTUP_OPTIONS = 0x03f8, + D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_DEPTHBOUNDSTEST_UNSUPPORTED = 0x03f9, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_DUPLICATE_SUBOBJECT = 0x03fa, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_UNKNOWN_SUBOBJECT = 0x03fb, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_ZERO_SIZE_STREAM = 0x03fc, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_INVALID_STREAM = 0x03fd, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CANNOT_DEDUCE_TYPE = 0x03fe, + D3D12_MESSAGE_ID_COMMAND_LIST_STATIC_DESCRIPTOR_RESOURCE_DIMENSION_MISMATCH = 0x03ff, + D3D12_MESSAGE_ID_CREATE_COMMAND_QUEUE_INSUFFICIENT_PRIVILEGE_FOR_GLOBAL_REALTIME = 0x0400, + D3D12_MESSAGE_ID_CREATE_COMMAND_QUEUE_INSUFFICIENT_HARDWARE_SUPPORT_FOR_GLOBAL_REALTIME = 0x0401, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_ARCHITECTURE = 0x0402, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_DST = 0x0403, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_DST_RESOURCE_DIMENSION = 0x0404, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_DST_RANGE_OUT_OF_BOUNDS = 0x0405, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_SRC = 0x0406, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_SRC_RESOURCE_DIMENSION = 0x0407, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_SRC_RANGE_OUT_OF_BOUNDS = 0x0408, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_OFFSET_ALIGNMENT = 0x0409, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_DEPENDENT_RESOURCES = 0x040a, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_DEPENDENT_SUBRESOURCE_RANGES = 0x040b, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_DEPENDENT_RESOURCE = 0x040c, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_DEPENDENT_SUBRESOURCE_RANGE = 0x040d, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_DEPENDENT_SUBRESOURCE_OUT_OF_BOUNDS = 0x040e, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_DEPENDENT_RANGE_OUT_OF_BOUNDS = 0x040f, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_ZERO_DEPENDENCIES = 0x0410, + D3D12_MESSAGE_ID_DEVICE_CREATE_SHARED_HANDLE_INVALIDARG = 0x0411, + D3D12_MESSAGE_ID_DESCRIPTOR_HANDLE_WITH_INVALID_RESOURCE = 0x0412, + D3D12_MESSAGE_ID_SETDEPTHBOUNDS_INVALIDARGS = 0x0413, + D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_RESOURCE_STATE_IMPRECISE = 0x0414, + D3D12_MESSAGE_ID_COMMAND_LIST_PIPELINE_STATE_NOT_SET = 0x0415, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_MODEL_MISMATCH = 0x0416, + D3D12_MESSAGE_ID_OBJECT_ACCESSED_WHILE_STILL_IN_USE = 0x0417, + D3D12_MESSAGE_ID_PROGRAMMABLE_MSAA_UNSUPPORTED = 0x0418, + D3D12_MESSAGE_ID_SETSAMPLEPOSITIONS_INVALIDARGS = 0x0419, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCEREGION_INVALID_RECT = 0x041a, + D3D12_MESSAGE_ID_CREATE_VIDEODECODECOMMANDQUEUE = 0x041b, + D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSCOMMANDLIST = 0x041c, + D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSCOMMANDQUEUE = 0x041d, + D3D12_MESSAGE_ID_LIVE_VIDEODECODECOMMANDQUEUE = 0x041e, + D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSCOMMANDLIST = 0x041f, + D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSCOMMANDQUEUE = 0x0420, + D3D12_MESSAGE_ID_DESTROY_VIDEODECODECOMMANDQUEUE = 0x0421, + D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSCOMMANDLIST = 0x0422, + D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSCOMMANDQUEUE = 0x0423, + D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSOR = 0x0424, + D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSSTREAM = 0x0425, + D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSOR = 0x0426, + D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSSTREAM = 0x0427, + D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSOR = 0x0428, + D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSSTREAM = 0x0429, + D3D12_MESSAGE_ID_PROCESS_FRAME_INVALID_PARAMETERS = 0x042a, + D3D12_MESSAGE_ID_COPY_INVALIDLAYOUT = 0x042b, + D3D12_MESSAGE_ID_CREATE_CRYPTO_SESSION = 0x042c, + D3D12_MESSAGE_ID_CREATE_CRYPTO_SESSION_POLICY = 0x042d, + D3D12_MESSAGE_ID_CREATE_PROTECTED_RESOURCE_SESSION = 0x042e, + D3D12_MESSAGE_ID_LIVE_CRYPTO_SESSION = 0x042f, + D3D12_MESSAGE_ID_LIVE_CRYPTO_SESSION_POLICY = 0x0430, + D3D12_MESSAGE_ID_LIVE_PROTECTED_RESOURCE_SESSION = 0x0431, + D3D12_MESSAGE_ID_DESTROY_CRYPTO_SESSION = 0x0432, + D3D12_MESSAGE_ID_DESTROY_CRYPTO_SESSION_POLICY = 0x0433, + D3D12_MESSAGE_ID_DESTROY_PROTECTED_RESOURCE_SESSION = 0x0434, + D3D12_MESSAGE_ID_PROTECTED_RESOURCE_SESSION_UNSUPPORTED = 0x0435, + D3D12_MESSAGE_ID_FENCE_INVALIDOPERATION = 0x0436, + D3D12_MESSAGE_ID_CREATEQUERY_HEAP_COPY_QUEUE_TIMESTAMPS_NOT_SUPPORTED = 0x0437, + D3D12_MESSAGE_ID_SAMPLEPOSITIONS_MISMATCH_DEFERRED = 0x0438, + D3D12_MESSAGE_ID_SAMPLEPOSITIONS_MISMATCH_RECORDTIME_ASSUMEDFROMFIRSTUSE = 0x0439, + D3D12_MESSAGE_ID_SAMPLEPOSITIONS_MISMATCH_RECORDTIME_ASSUMEDFROMCLEAR = 0x043a, + D3D12_MESSAGE_ID_CREATE_VIDEODECODERHEAP = 0x043b, + D3D12_MESSAGE_ID_LIVE_VIDEODECODERHEAP = 0x043c, + D3D12_MESSAGE_ID_DESTROY_VIDEODECODERHEAP = 0x043d, + D3D12_MESSAGE_ID_OPENEXISTINGHEAP_INVALIDARG_RETURN = 0x043e, + D3D12_MESSAGE_ID_OPENEXISTINGHEAP_OUTOFMEMORY_RETURN = 0x043f, + D3D12_MESSAGE_ID_OPENEXISTINGHEAP_INVALIDADDRESS = 0x0440, + D3D12_MESSAGE_ID_OPENEXISTINGHEAP_INVALIDHANDLE = 0x0441, + D3D12_MESSAGE_ID_WRITEBUFFERIMMEDIATE_INVALID_DEST = 0x0442, + D3D12_MESSAGE_ID_WRITEBUFFERIMMEDIATE_INVALID_MODE = 0x0443, + D3D12_MESSAGE_ID_WRITEBUFFERIMMEDIATE_INVALID_ALIGNMENT = 0x0444, + D3D12_MESSAGE_ID_WRITEBUFFERIMMEDIATE_NOT_SUPPORTED = 0x0445, + D3D12_MESSAGE_ID_SETVIEWINSTANCEMASK_INVALIDARGS = 0x0446, + D3D12_MESSAGE_ID_VIEW_INSTANCING_UNSUPPORTED = 0x0447, + D3D12_MESSAGE_ID_VIEW_INSTANCING_INVALIDARGS = 0x0448, + D3D12_MESSAGE_ID_COPYTEXTUREREGION_MISMATCH_DECODE_REFERENCE_ONLY_FLAG = 0x0449, + D3D12_MESSAGE_ID_COPYRESOURCE_MISMATCH_DECODE_REFERENCE_ONLY_FLAG = 0x044a, + D3D12_MESSAGE_ID_CREATE_VIDEO_DECODE_HEAP_CAPS_FAILURE = 0x044b, + D3D12_MESSAGE_ID_CREATE_VIDEO_DECODE_HEAP_CAPS_UNSUPPORTED = 0x044c, + D3D12_MESSAGE_ID_VIDEO_DECODE_SUPPORT_INVALID_INPUT = 0x044d, + D3D12_MESSAGE_ID_CREATE_VIDEO_DECODER_UNSUPPORTED = 0x044e, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_METADATA_ERROR = 0x044f, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_VIEW_INSTANCING_VERTEX_SIZE_EXCEEDED = 0x0450, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_RUNTIME_INTERNAL_ERROR = 0x0451, + D3D12_MESSAGE_ID_NO_VIDEO_API_SUPPORT = 0x0452, + D3D12_MESSAGE_ID_VIDEO_PROCESS_SUPPORT_INVALID_INPUT = 0x0453, + D3D12_MESSAGE_ID_CREATE_VIDEO_PROCESSOR_CAPS_FAILURE = 0x0454, + D3D12_MESSAGE_ID_VIDEO_PROCESS_SUPPORT_UNSUPPORTED_FORMAT = 0x0455, + D3D12_MESSAGE_ID_VIDEO_DECODE_FRAME_INVALID_ARGUMENT = 0x0456, + D3D12_MESSAGE_ID_ENQUEUE_MAKE_RESIDENT_INVALID_FLAGS = 0x0457, + D3D12_MESSAGE_ID_OPENEXISTINGHEAP_UNSUPPORTED = 0x0458, + D3D12_MESSAGE_ID_VIDEO_PROCESS_FRAMES_INVALID_ARGUMENT = 0x0459, + D3D12_MESSAGE_ID_VIDEO_DECODE_SUPPORT_UNSUPPORTED = 0x045a, + D3D12_MESSAGE_ID_CREATE_COMMANDRECORDER = 0x045b, + D3D12_MESSAGE_ID_LIVE_COMMANDRECORDER = 0x045c, + D3D12_MESSAGE_ID_DESTROY_COMMANDRECORDER = 0x045d, + D3D12_MESSAGE_ID_CREATE_COMMAND_RECORDER_VIDEO_NOT_SUPPORTED = 0x045e, + D3D12_MESSAGE_ID_CREATE_COMMAND_RECORDER_INVALID_SUPPORT_FLAGS = 0x045f, + D3D12_MESSAGE_ID_CREATE_COMMAND_RECORDER_INVALID_FLAGS = 0x0460, + D3D12_MESSAGE_ID_CREATE_COMMAND_RECORDER_MORE_RECORDERS_THAN_LOGICAL_PROCESSORS = 0x0461, + D3D12_MESSAGE_ID_CREATE_COMMANDPOOL = 0x0462, + D3D12_MESSAGE_ID_LIVE_COMMANDPOOL = 0x0463, + D3D12_MESSAGE_ID_DESTROY_COMMANDPOOL = 0x0464, + D3D12_MESSAGE_ID_CREATE_COMMAND_POOL_INVALID_FLAGS = 0x0465, + D3D12_MESSAGE_ID_CREATE_COMMAND_LIST_VIDEO_NOT_SUPPORTED = 0x0466, + D3D12_MESSAGE_ID_COMMAND_RECORDER_SUPPORT_FLAGS_MISMATCH = 0x0467, + D3D12_MESSAGE_ID_COMMAND_RECORDER_CONTENTION = 0x0468, + D3D12_MESSAGE_ID_COMMAND_RECORDER_USAGE_WITH_CREATECOMMANDLIST_COMMAND_LIST = 0x0469, + D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_USAGE_WITH_CREATECOMMANDLIST1_COMMAND_LIST = 0x046a, + D3D12_MESSAGE_ID_CANNOT_EXECUTE_EMPTY_COMMAND_LIST = 0x046b, + D3D12_MESSAGE_ID_CANNOT_RESET_COMMAND_POOL_WITH_OPEN_COMMAND_LISTS = 0x046c, + D3D12_MESSAGE_ID_CANNOT_USE_COMMAND_RECORDER_WITHOUT_CURRENT_TARGET = 0x046d, + D3D12_MESSAGE_ID_CANNOT_CHANGE_COMMAND_RECORDER_TARGET_WHILE_RECORDING = 0x046e, + D3D12_MESSAGE_ID_COMMAND_POOL_SYNC = 0x046f, + D3D12_MESSAGE_ID_EVICT_UNDERFLOW = 0x0470, + D3D12_MESSAGE_ID_CREATE_META_COMMAND = 0x0471, + D3D12_MESSAGE_ID_LIVE_META_COMMAND = 0x0472, + D3D12_MESSAGE_ID_DESTROY_META_COMMAND = 0x0473, + D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALID_DST_RESOURCE = 0x0474, + D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALID_SRC_RESOURCE = 0x0475, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_DST_RESOURCE = 0x0476, + D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_SRC_RESOURCE = 0x0477, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_NULL_BUFFER = 0x0478, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_NULL_RESOURCE_DESC = 0x0479, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_UNSUPPORTED = 0x047a, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_BUFFER_DIMENSION = 0x047b, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_BUFFER_FLAGS = 0x047c, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_BUFFER_OFFSET = 0x047d, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_RESOURCE_DIMENSION = 0x047e, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_RESOURCE_FLAGS = 0x047f, + D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_OUTOFMEMORY_RETURN = 0x0480, + D3D12_MESSAGE_ID_CANNOT_CREATE_GRAPHICS_AND_VIDEO_COMMAND_RECORDER = 0x0481, + D3D12_MESSAGE_ID_UPDATETILEMAPPINGS_POSSIBLY_MISMATCHING_PROPERTIES = 0x0482, + D3D12_MESSAGE_ID_CREATE_COMMAND_LIST_INVALID_COMMAND_LIST_TYPE = 0x0483, + D3D12_MESSAGE_ID_CLEARUNORDEREDACCESSVIEW_INCOMPATIBLE_WITH_STRUCTURED_BUFFERS = 0x0484, + D3D12_MESSAGE_ID_COMPUTE_ONLY_DEVICE_OPERATION_UNSUPPORTED = 0x0485, + D3D12_MESSAGE_ID_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INVALID = 0x0486, + D3D12_MESSAGE_ID_EMIT_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_INVALID = 0x0487, + D3D12_MESSAGE_ID_COPY_RAYTRACING_ACCELERATION_STRUCTURE_INVALID = 0x0488, + D3D12_MESSAGE_ID_DISPATCH_RAYS_INVALID = 0x0489, + D3D12_MESSAGE_ID_GET_RAYTRACING_ACCELERATION_STRUCTURE_PREBUILD_INFO_INVALID = 0x048a, + D3D12_MESSAGE_ID_CREATE_LIFETIMETRACKER = 0x048b, + D3D12_MESSAGE_ID_LIVE_LIFETIMETRACKER = 0x048c, + D3D12_MESSAGE_ID_DESTROY_LIFETIMETRACKER = 0x048d, + D3D12_MESSAGE_ID_DESTROYOWNEDOBJECT_OBJECTNOTOWNED = 0x048e, + D3D12_MESSAGE_ID_CREATE_TRACKEDWORKLOAD = 0x048f, + D3D12_MESSAGE_ID_LIVE_TRACKEDWORKLOAD = 0x0490, + D3D12_MESSAGE_ID_DESTROY_TRACKEDWORKLOAD = 0x0491, + D3D12_MESSAGE_ID_RENDER_PASS_ERROR = 0x0492, + D3D12_MESSAGE_ID_META_COMMAND_ID_INVALID = 0x0493, + D3D12_MESSAGE_ID_META_COMMAND_UNSUPPORTED_PARAMS = 0x0494, + D3D12_MESSAGE_ID_META_COMMAND_FAILED_ENUMERATION = 0x0495, + D3D12_MESSAGE_ID_META_COMMAND_PARAMETER_SIZE_MISMATCH = 0x0496, + D3D12_MESSAGE_ID_UNINITIALIZED_META_COMMAND = 0x0497, + D3D12_MESSAGE_ID_META_COMMAND_INVALID_GPU_VIRTUAL_ADDRESS = 0x0498, + D3D12_MESSAGE_ID_CREATE_VIDEOENCODECOMMANDLIST = 0x0499, + D3D12_MESSAGE_ID_LIVE_VIDEOENCODECOMMANDLIST = 0x049a, + D3D12_MESSAGE_ID_DESTROY_VIDEOENCODECOMMANDLIST = 0x049b, + D3D12_MESSAGE_ID_CREATE_VIDEOENCODECOMMANDQUEUE = 0x049c, + D3D12_MESSAGE_ID_LIVE_VIDEOENCODECOMMANDQUEUE = 0x049d, + D3D12_MESSAGE_ID_DESTROY_VIDEOENCODECOMMANDQUEUE = 0x049e, + D3D12_MESSAGE_ID_CREATE_VIDEOMOTIONESTIMATOR = 0x049f, + D3D12_MESSAGE_ID_LIVE_VIDEOMOTIONESTIMATOR = 0x04a0, + D3D12_MESSAGE_ID_DESTROY_VIDEOMOTIONESTIMATOR = 0x04a1, + D3D12_MESSAGE_ID_CREATE_VIDEOMOTIONVECTORHEAP = 0x04a2, + D3D12_MESSAGE_ID_LIVE_VIDEOMOTIONVECTORHEAP = 0x04a3, + D3D12_MESSAGE_ID_DESTROY_VIDEOMOTIONVECTORHEAP = 0x04a4, + D3D12_MESSAGE_ID_MULTIPLE_TRACKED_WORKLOADS = 0x04a5, + D3D12_MESSAGE_ID_MULTIPLE_TRACKED_WORKLOAD_PAIRS = 0x04a6, + D3D12_MESSAGE_ID_OUT_OF_ORDER_TRACKED_WORKLOAD_PAIR = 0x04a7, + D3D12_MESSAGE_ID_CANNOT_ADD_TRACKED_WORKLOAD = 0x04a8, + D3D12_MESSAGE_ID_INCOMPLETE_TRACKED_WORKLOAD_PAIR = 0x04a9, + D3D12_MESSAGE_ID_CREATE_STATE_OBJECT_ERROR = 0x04aa, + D3D12_MESSAGE_ID_GET_SHADER_IDENTIFIER_ERROR = 0x04ab, + D3D12_MESSAGE_ID_GET_SHADER_STACK_SIZE_ERROR = 0x04ac, + D3D12_MESSAGE_ID_GET_PIPELINE_STACK_SIZE_ERROR = 0x04ad, + D3D12_MESSAGE_ID_SET_PIPELINE_STACK_SIZE_ERROR = 0x04ae, + D3D12_MESSAGE_ID_GET_SHADER_IDENTIFIER_SIZE_INVALID = 0x04af, + D3D12_MESSAGE_ID_CHECK_DRIVER_MATCHING_IDENTIFIER_INVALID = 0x04b0, + D3D12_MESSAGE_ID_CHECK_DRIVER_MATCHING_IDENTIFIER_DRIVER_REPORTED_ISSUE = 0x04b1, + D3D12_MESSAGE_ID_RENDER_PASS_INVALID_RESOURCE_BARRIER = 0x04b2, + D3D12_MESSAGE_ID_RENDER_PASS_DISALLOWED_API_CALLED = 0x04b3, + D3D12_MESSAGE_ID_RENDER_PASS_CANNOT_NEST_RENDER_PASSES = 0x04b4, + D3D12_MESSAGE_ID_RENDER_PASS_CANNOT_END_WITHOUT_BEGIN = 0x04b5, + D3D12_MESSAGE_ID_RENDER_PASS_CANNOT_CLOSE_COMMAND_LIST = 0x04b6, + D3D12_MESSAGE_ID_RENDER_PASS_GPU_WORK_WHILE_SUSPENDED = 0x04b7, + D3D12_MESSAGE_ID_RENDER_PASS_MISMATCHING_SUSPEND_RESUME = 0x04b8, + D3D12_MESSAGE_ID_RENDER_PASS_NO_PRIOR_SUSPEND_WITHIN_EXECUTECOMMANDLISTS = 0x04b9, + D3D12_MESSAGE_ID_RENDER_PASS_NO_SUBSEQUENT_RESUME_WITHIN_EXECUTECOMMANDLISTS = 0x04ba, + D3D12_MESSAGE_ID_TRACKED_WORKLOAD_COMMAND_QUEUE_MISMATCH = 0x04bb, + D3D12_MESSAGE_ID_TRACKED_WORKLOAD_NOT_SUPPORTED = 0x04bc, + D3D12_MESSAGE_ID_RENDER_PASS_MISMATCHING_NO_ACCESS = 0x04bd, + D3D12_MESSAGE_ID_RENDER_PASS_UNSUPPORTED_RESOLVE = 0x04be, + D3D12_MESSAGE_ID_CLEARUNORDEREDACCESSVIEW_INVALID_RESOURCE_PTR = 0x04bf, + D3D12_MESSAGE_ID_WINDOWS7_FENCE_OUTOFORDER_SIGNAL = 0x04c0, + D3D12_MESSAGE_ID_WINDOWS7_FENCE_OUTOFORDER_WAIT = 0x04c1, + D3D12_MESSAGE_ID_VIDEO_CREATE_MOTION_ESTIMATOR_INVALID_ARGUMENT = 0x04c2, + D3D12_MESSAGE_ID_VIDEO_CREATE_MOTION_VECTOR_HEAP_INVALID_ARGUMENT = 0x04c3, + D3D12_MESSAGE_ID_ESTIMATE_MOTION_INVALID_ARGUMENT = 0x04c4, + D3D12_MESSAGE_ID_RESOLVE_MOTION_VECTOR_HEAP_INVALID_ARGUMENT = 0x04c5, + D3D12_MESSAGE_ID_GETGPUVIRTUALADDRESS_INVALID_HEAP_TYPE = 0x04c6, + D3D12_MESSAGE_ID_SET_BACKGROUND_PROCESSING_MODE_INVALID_ARGUMENT = 0x04c7, + D3D12_MESSAGE_ID_CREATE_COMMAND_LIST_INVALID_COMMAND_LIST_TYPE_FOR_FEATURE_LEVEL = 0x04c8, + D3D12_MESSAGE_ID_CREATE_VIDEOEXTENSIONCOMMAND = 0x04c9, + D3D12_MESSAGE_ID_LIVE_VIDEOEXTENSIONCOMMAND = 0x04ca, + D3D12_MESSAGE_ID_DESTROY_VIDEOEXTENSIONCOMMAND = 0x04cb, + D3D12_MESSAGE_ID_INVALID_VIDEO_EXTENSION_COMMAND_ID = 0x04cc, + D3D12_MESSAGE_ID_VIDEO_EXTENSION_COMMAND_INVALID_ARGUMENT = 0x04cd, + D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_NOT_UNIQUE_IN_DXIL_LIBRARY = 0x04ce, + D3D12_MESSAGE_ID_VARIABLE_SHADING_RATE_NOT_ALLOWED_WITH_TIR = 0x04cf, + D3D12_MESSAGE_ID_GEOMETRY_SHADER_OUTPUTTING_BOTH_VIEWPORT_ARRAY_INDEX_AND_SHADING_RATE_NOT_SUPPORTED_ON_DEVICE = 0x04d0, + D3D12_MESSAGE_ID_RSSETSHADING_RATE_INVALID_SHADING_RATE = 0x04d1, + D3D12_MESSAGE_ID_RSSETSHADING_RATE_SHADING_RATE_NOT_PERMITTED_BY_CAP = 0x04d2, + D3D12_MESSAGE_ID_RSSETSHADING_RATE_INVALID_COMBINER = 0x04d3, + D3D12_MESSAGE_ID_RSSETSHADINGRATEIMAGE_REQUIRES_TIER_2 = 0x04d4, + D3D12_MESSAGE_ID_RSSETSHADINGRATE_REQUIRES_TIER_1 = 0x04d5, + D3D12_MESSAGE_ID_SHADING_RATE_IMAGE_INCORRECT_FORMAT = 0x04d6, + D3D12_MESSAGE_ID_SHADING_RATE_IMAGE_INCORRECT_ARRAY_SIZE = 0x04d7, + D3D12_MESSAGE_ID_SHADING_RATE_IMAGE_INCORRECT_MIP_LEVEL = 0x04d8, + D3D12_MESSAGE_ID_SHADING_RATE_IMAGE_INCORRECT_SAMPLE_COUNT = 0x04d9, + D3D12_MESSAGE_ID_SHADING_RATE_IMAGE_INCORRECT_SAMPLE_QUALITY = 0x04da, + D3D12_MESSAGE_ID_NON_RETAIL_SHADER_MODEL_WONT_VALIDATE = 0x04db, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_AS_ROOT_SIGNATURE_MISMATCH = 0x04dc, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_MS_ROOT_SIGNATURE_MISMATCH = 0x04dd, + D3D12_MESSAGE_ID_ADD_TO_STATE_OBJECT_ERROR = 0x04de, + D3D12_MESSAGE_ID_CREATE_PROTECTED_RESOURCE_SESSION_INVALID_ARGUMENT = 0x04df, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_MS_PSO_DESC_MISMATCH = 0x04e0, + D3D12_MESSAGE_ID_CREATEPIPELINESTATE_MS_INCOMPLETE_TYPE = 0x04e1, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_AS_NOT_MS_MISMATCH = 0x04e2, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_MS_NOT_PS_MISMATCH = 0x04e3, + D3D12_MESSAGE_ID_NONZERO_SAMPLER_FEEDBACK_MIP_REGION_WITH_INCOMPATIBLE_FORMAT = 0x04e4, + D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INPUTLAYOUT_SHADER_MISMATCH = 0x04e5, + D3D12_MESSAGE_ID_EMPTY_DISPATCH = 0x04e6, + D3D12_MESSAGE_ID_RESOURCE_FORMAT_REQUIRES_SAMPLER_FEEDBACK_CAPABILITY = 0x04e7, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_MAP_INVALID_MIP_REGION = 0x04e8, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_MAP_INVALID_DIMENSION = 0x04e9, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_MAP_INVALID_SAMPLE_COUNT = 0x04ea, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_MAP_INVALID_SAMPLE_QUALITY = 0x04eb, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_MAP_INVALID_LAYOUT = 0x04ec, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_MAP_REQUIRES_UNORDERED_ACCESS_FLAG = 0x04ed, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_CREATE_UAV_NULL_ARGUMENTS = 0x04ee, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_UAV_REQUIRES_SAMPLER_FEEDBACK_CAPABILITY = 0x04ef, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_CREATE_UAV_REQUIRES_FEEDBACK_MAP_FORMAT = 0x04f0, + D3D12_MESSAGE_ID_CREATEMESHSHADER_INVALIDSHADERBYTECODE = 0x04f1, + D3D12_MESSAGE_ID_CREATEMESHSHADER_OUTOFMEMORY = 0x04f2, + D3D12_MESSAGE_ID_CREATEMESHSHADERWITHSTREAMOUTPUT_INVALIDSHADERTYPE = 0x04f3, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_SAMPLER_FEEDBACK_TRANSCODE_INVALID_FORMAT = 0x04f4, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_SAMPLER_FEEDBACK_INVALID_MIP_LEVEL_COUNT = 0x04f5, + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_SAMPLER_FEEDBACK_TRANSCODE_ARRAY_SIZE_MISMATCH = 0x04f6, + D3D12_MESSAGE_ID_SAMPLER_FEEDBACK_CREATE_UAV_MISMATCHING_TARGETED_RESOURCE = 0x04f7, + D3D12_MESSAGE_ID_CREATEMESHSHADER_OUTPUTEXCEEDSMAXSIZE = 0x04f8, + D3D12_MESSAGE_ID_CREATEMESHSHADER_GROUPSHAREDEXCEEDSMAXSIZE = 0x04f9, + D3D12_MESSAGE_ID_VERTEX_SHADER_OUTPUTTING_BOTH_VIEWPORT_ARRAY_INDEX_AND_SHADING_RATE_NOT_SUPPORTED_ON_DEVICE = 0x04fa, + D3D12_MESSAGE_ID_MESH_SHADER_OUTPUTTING_BOTH_VIEWPORT_ARRAY_INDEX_AND_SHADING_RATE_NOT_SUPPORTED_ON_DEVICE = 0x04fb, + D3D12_MESSAGE_ID_CREATEMESHSHADER_MISMATCHEDASMSPAYLOADSIZE = 0x04fc, + D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_UNBOUNDED_STATIC_DESCRIPTORS = 0x04fd, + D3D12_MESSAGE_ID_CREATEAMPLIFICATIONSHADER_INVALIDSHADERBYTECODE = 0x04fe, + D3D12_MESSAGE_ID_CREATEAMPLIFICATIONSHADER_OUTOFMEMORY = 0x04ff, + D3D12_MESSAGE_ID_D3D12_MESSAGES_END +} D3D12_MESSAGE_ID; + +typedef struct D3D12_MESSAGE +{ + D3D12_MESSAGE_CATEGORY Category; + D3D12_MESSAGE_SEVERITY Severity; + D3D12_MESSAGE_ID ID; + const char *pDescription; + SIZE_T DescriptionByteLength; +} D3D12_MESSAGE; + +typedef struct D3D12_INFO_QUEUE_FILTER_DESC +{ + UINT NumCategories; + D3D12_MESSAGE_CATEGORY *pCategoryList; + UINT NumSeverities; + D3D12_MESSAGE_SEVERITY *pSeverityList; + UINT NumIDs; + D3D12_MESSAGE_ID *pIDList; +} D3D12_INFO_QUEUE_FILTER_DESC; + +typedef struct D3D12_INFO_QUEUE_FILTER +{ + D3D12_INFO_QUEUE_FILTER_DESC AllowList; + D3D12_INFO_QUEUE_FILTER_DESC DenyList; +} D3D12_INFO_QUEUE_FILTER; + [ uuid(344488b7-6846-474b-b989-f027448245e0), object, @@ -41,3 +938,49 @@ interface ID3D12Debug1 : IUnknown void SetEnableGPUBasedValidation(BOOL enable); void SetEnableSynchronizedCommandQueueValidation(BOOL enable); } + +[ + uuid(0742a90b-c387-483f-b946-30a7e4e61458), + object, + local, + pointer_default(unique) +] +interface ID3D12InfoQueue : IUnknown +{ + HRESULT SetMessageCountLimit([in] UINT64 limit); + void ClearStoredMessages(); + HRESULT GetMessage([in] UINT64 index, [out] D3D12_MESSAGE *message, [in, out] SIZE_T *length); + UINT64 GetNumMessagesAllowedByStorageFilter(); + UINT64 GetNumMessagesDeniedByStorageFilter(); + UINT64 GetNumStoredMessages(); + UINT64 GetNumStoredMessagesAllowedByRetrievalFilter(); + UINT64 GetNumMessagesDiscardedByMessageCountLimit(); + UINT64 GetMessageCountLimit(); + HRESULT AddStorageFilterEntries([in] D3D12_INFO_QUEUE_FILTER *filter); + HRESULT GetStorageFilter([out] D3D12_INFO_QUEUE_FILTER *filter, [in, out] SIZE_T *length); + void ClearStorageFilter(); + HRESULT PushEmptyStorageFilter(); + HRESULT PushCopyOfStorageFilter(); + HRESULT PushStorageFilter([in] D3D12_INFO_QUEUE_FILTER *filter); + void PopStorageFilter(); + UINT GetStorageFilterStackSize(); + HRESULT AddRetrievalFilterEntries([in] D3D12_INFO_QUEUE_FILTER *filter); + HRESULT GetRetrievalFilter([out] D3D12_INFO_QUEUE_FILTER *filter, [in, out] SIZE_T *length); + void ClearRetrievalFilter(); + HRESULT PushEmptyRetrievalFilter(); + HRESULT PushCopyOfRetrievalFilter(); + HRESULT PushRetrievalFilter([in] D3D12_INFO_QUEUE_FILTER *filter); + void PopRetrievalFilter(); + UINT GetRetrievalFilterStackSize(); + HRESULT AddMessage([in] D3D12_MESSAGE_CATEGORY category, [in] D3D12_MESSAGE_SEVERITY severity, + [in] D3D12_MESSAGE_ID id, [in] const char *description); + HRESULT AddApplicationMessage([in] D3D12_MESSAGE_SEVERITY severity, [in] const char *description); + HRESULT SetBreakOnCategory([in] D3D12_MESSAGE_CATEGORY category, [in] BOOL enable); + HRESULT SetBreakOnSeverity([in] D3D12_MESSAGE_SEVERITY severity, [in] BOOL enable); + HRESULT SetBreakOnID([in] D3D12_MESSAGE_ID id, [in] BOOL enable); + BOOL GetBreakOnCategory([in] D3D12_MESSAGE_CATEGORY category); + BOOL GetBreakOnSeverity([in] D3D12_MESSAGE_SEVERITY severity); + BOOL GetBreakOnID([in] D3D12_MESSAGE_ID id); + void SetMuteDebugOutput([in] BOOL mute); + BOOL GetMuteDebugOutput(); +} -- 2.11.0

1 0

[PATCH 5/5] dssenh: Implement CPHashData.
by Hans Leidekker 07 Oct '20

07 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 12 +++++++++++- dlls/dssenh/tests/dssenh.c | 24 ++++++++++++------------ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index e406117e97..77b5570fc5 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -1,5 +1,6 @@ /* * Copyright 2008 Maarten Lankhorst + * Copyright 2020 Hans Leidekker for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -413,7 +414,16 @@ BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) { - return FALSE; + struct hash *hash = (struct hash *)hhash; + + TRACE("%p, %p, %p, %u, %08x\n", hprov, hhash, data, len, flags ); + + if (hash->magic != MAGIC_HASH) return FALSE; + + if (hash->finished || BCryptHashData( hash->handle, (UCHAR *)data, len, 0 )) return FALSE; + + hash->finished = TRUE; + return TRUE; } BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYTE *data, DWORD *len, DWORD flags ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index f06cdd1433..cc4650b2c8 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -449,15 +449,15 @@ static void test_hash(const struct hash_test *tests, int testLen) ok(result, "Expected creation of a hash.\n"); result = CryptHashData(hHash, data, dataLen, 0); + ok(result, "Expected data to be added to hash.\n"); + + dataLen = sizeof(DWORD); + result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&hashLen, &dataLen, 0); if (!result) { skip("skipping hash tests\n"); return; } - ok(result, "Expected data to be added to hash.\n"); - - dataLen = sizeof(DWORD); - result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&hashLen, &dataLen, 0); ok(result && (hashLen == tests[i].hashLen), "Expected %d hash len, got %d.Error: %x\n", tests[i].hashLen, hashLen, GetLastError()); @@ -608,15 +608,15 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); + ok(result, "Expected data to be added to hash for key derivation.\n"); + + /* Derive key */ + result = CryptDeriveKey(hProv, tests[i].algid, hHash, tests[i].keyLength, &pKey); if (!result) { skip("skipping encryption tests\n"); return; } - ok(result, "Expected data to be added to hash for key derivation.\n"); - - /* Derive key */ - result = CryptDeriveKey(hProv, tests[i].algid, hHash, tests[i].keyLength, &pKey); ok(result, "Expected a derived key.\n"); result = CryptDestroyHash(hHash); @@ -698,15 +698,15 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); + ok(result, "Expected data to be added to hash for key derivation.\n"); + + /* Derive a CALG_RC2 key, but could be any other encryption cipher */ + result = CryptDeriveKey(hProv, CALG_RC2, hHash, 40 << 16, &pKey); if (!result) { skip("skipping ciper modes tests\n"); return; } - ok(result, "Expected data to be added to hash for key derivation.\n"); - - /* Derive a CALG_RC2 key, but could be any other encryption cipher */ - result = CryptDeriveKey(hProv, CALG_RC2, hHash, 40 << 16, &pKey); ok(result, "Expected a derived key.\n"); result = CryptDestroyHash(hHash); -- 2.28.0

2 1

[PATCH 4/5] dssenh: Implement CPCreateHash and CPDestroyHash.
by Hans Leidekker 07 Oct '20

07 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 90 +++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 18 ++++---- 2 files changed, 97 insertions(+), 11 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index ea082b29e3..e406117e97 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -54,6 +54,17 @@ struct container char name[MAX_PATH]; }; +#define MAGIC_HASH (('H' << 24) | ('A' << 16) | ('S' << 8) | 'H') +struct hash +{ + DWORD magic; + BCRYPT_ALG_HANDLE alg_handle; + BCRYPT_HASH_HANDLE handle; + DWORD len; + UCHAR value[64]; + BOOL finished; +}; + static const char dss_path_fmt[] = "Software\\Wine\\Crypto\\DSS\\%s"; static BOOL create_container_regkey( struct container *container, REGSAM sam, HKEY *hkey ) @@ -315,14 +326,89 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW return FALSE; } +static struct hash *create_hash( ALG_ID algid ) +{ + struct hash *ret; + const WCHAR *alg; + DWORD len; + + switch (algid) + { + case CALG_MD5: + alg = BCRYPT_MD5_ALGORITHM; + len = 16; + break; + + case CALG_SHA1: + alg = BCRYPT_SHA1_ALGORITHM; + len = 20; + break; + + default: + FIXME( "unhandled algorithm %u\n", algid ); + return 0; + } + + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return 0; + + ret->magic = MAGIC_HASH; + ret->len = len; + if (BCryptOpenAlgorithmProvider( &ret->alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) + { + heap_free( ret ); + return 0; + } + if (BCryptCreateHash( ret->alg_handle, &ret->handle, NULL, 0, NULL, 0, 0 )) + { + BCryptCloseAlgorithmProvider( ret->alg_handle, 0 ); + heap_free( ret ); + return 0; + } + return ret; +} + BOOL WINAPI CPCreateHash( HCRYPTPROV hprov, ALG_ID algid, HCRYPTKEY hkey, DWORD flags, HCRYPTHASH *ret_hash ) { - return FALSE; + struct hash *hash; + + TRACE( "%p, %08x, %p, %08x, %p\n", hprov, algid, hkey, flags, ret_hash ); + + switch (algid) + { + case CALG_MD5: + case CALG_SHA1: + break; + + default: + FIXME( "algorithm %u not supported\n", algid ); + SetLastError( NTE_BAD_ALGID ); + return FALSE; + } + + if (!(hash = create_hash( algid ))) return FALSE; + + *ret_hash = (HCRYPTHASH)hash; + return TRUE; } BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) { - return FALSE; + struct hash *hash = (struct hash *)hhash; + + TRACE( "%p, %p\n", hprov, hhash); + + if (hash->magic != MAGIC_HASH) + { + SetLastError( NTE_BAD_HASH ); + return FALSE; + } + + BCryptDestroyHash( hash->handle ); + BCryptCloseAlgorithmProvider( hash->alg_handle, 0 ); + + hash->magic = 0; + heap_free( hash ); + return TRUE; } BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index d549b985d6..f06cdd1433 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -446,14 +446,14 @@ static void test_hash(const struct hash_test *tests, int testLen) /* test algid hash */ result = CryptCreateHash(hProv, tests[i].algid, 0, 0, &hHash); + ok(result, "Expected creation of a hash.\n"); + + result = CryptHashData(hHash, data, dataLen, 0); if (!result) { skip("skipping hash tests\n"); return; } - ok(result, "Expected creation of a hash.\n"); - - result = CryptHashData(hHash, data, dataLen, 0); ok(result, "Expected data to be added to hash.\n"); dataLen = sizeof(DWORD); @@ -605,14 +605,14 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + ok(result, "Expected creation of a MD5 hash for key derivation.\n"); + + result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); if (!result) { skip("skipping encryption tests\n"); return; } - ok(result, "Expected creation of a MD5 hash for key derivation.\n"); - - result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); ok(result, "Expected data to be added to hash for key derivation.\n"); /* Derive key */ @@ -695,14 +695,14 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + ok(result, "Expected creation of a MD5 hash for key derivation.\n"); + + result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); if (!result) { skip("skipping ciper modes tests\n"); return; } - ok(result, "Expected creation of a MD5 hash for key derivation.\n"); - - result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); ok(result, "Expected data to be added to hash for key derivation.\n"); /* Derive a CALG_RC2 key, but could be any other encryption cipher */ -- 2.28.0

2 1

[PATCH 2/5] dssenh: Register the DSS provider.
by Hans Leidekker 07 Oct '20

07 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/Makefile.in | 2 ++ dlls/dssenh/dssenh.rgs | 56 ++++++++++++++++++++++++++++++++++++++ dlls/dssenh/main.c | 22 +++++++++------ dlls/dssenh/rsrc.rc | 22 +++++++++++++++ dlls/dssenh/tests/dssenh.c | 5 ++-- 5 files changed, 95 insertions(+), 12 deletions(-) create mode 100644 dlls/dssenh/dssenh.rgs create mode 100644 dlls/dssenh/rsrc.rc diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in index 4f05beee51..8015768f99 100644 --- a/dlls/dssenh/Makefile.in +++ b/dlls/dssenh/Makefile.in @@ -4,3 +4,5 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c + +RC_SRCS = rsrc.rc diff --git a/dlls/dssenh/dssenh.rgs b/dlls/dssenh/dssenh.rgs new file mode 100644 index 0000000000..0e9bad7c17 --- /dev/null +++ b/dlls/dssenh/dssenh.rgs @@ -0,0 +1,56 @@ +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Cryptography + { + NoRemove Defaults + { + NoRemove Provider + { + ForceRemove 'Microsoft Base DSS Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 3 + } + ForceRemove 'Microsoft Base DSS and Diffie-Hellman Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 13 + } + ForceRemove 'Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 13 + } + ForceRemove 'Microsoft DH SChannel Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 18 + } + } + NoRemove 'Provider Types' + { + ForceRemove 'Type 003' + { + val 'Name' = s 'Microsoft Base DSS Cryptographic Provider' + val 'TypeName' = s 'DSS Signature' + } + ForceRemove 'Type 013' + { + val 'Name' = s 'Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider' + val 'TypeName' = s 'DSS Signature with Diffie-Hellman Key Exchange' + } + ForceRemove 'Type 018' + { + val 'Name' = s 'Microsoft DH SChannel Cryptographic Provider' + val 'TypeName' = s 'Diffie-Hellman SChannel' + } + } + } + } + } + } +} diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index b8dab20751..3d5e8d97d6 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -22,8 +22,13 @@ #include "windef.h" #include "winbase.h" #include "wincrypt.h" +#include "objbase.h" +#include "rpcproxy.h" + #include "wine/debug.h" +static HINSTANCE instance; + WINE_DEFAULT_DEBUG_CHANNEL(dssenh); BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) @@ -101,11 +106,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + instance = hinstDLL; + DisableThreadLibraryCalls(hinstDLL); + break; } return TRUE; } @@ -115,8 +121,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) */ HRESULT WINAPI DllRegisterServer(void) { - FIXME("Not implemented.\n"); - return E_UNEXPECTED; + return __wine_register_resources( instance ); } /***************************************************** @@ -124,6 +129,5 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - FIXME("Not implemented.\n"); - return E_UNEXPECTED; + return __wine_unregister_resources( instance ); } diff --git a/dlls/dssenh/rsrc.rc b/dlls/dssenh/rsrc.rc new file mode 100644 index 0000000000..ac5ba6258e --- /dev/null +++ b/dlls/dssenh/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Resources for dssenh + * + * Copyright 2020 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: dssenh.rgs */ +1 WINE_REGISTRY dssenh.rgs diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 7a16acc679..c88fcd1466 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -54,7 +54,6 @@ static void test_acquire_context(void) /* cannot acquire along with PROV_RSA_SIG, not compatible */ SetLastError(0xdeadbeef); result = CryptAcquireContextA(&hProv, NULL, MS_DEF_DSS_PROV_A, PROV_RSA_SIG, 0); - todo_wine ok(!result && GetLastError() == NTE_PROV_TYPE_NO_MATCH, "Expected NTE_PROV_TYPE_NO_MATCH, got %08x\n", GetLastError()); @@ -574,7 +573,7 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptAcquireContextA( &hProv, NULL, MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); - if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) + if (!result) { skip("DSSENH is currently not available, skipping encryption tests.\n"); return; @@ -665,7 +664,7 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptAcquireContextA( &hProv, NULL, MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); - if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) + if (!result) { skip("DSSENH is currently not available, skipping block cipher mode tests.\n"); return; -- 2.28.0

2 1

[PATCH 1/5] dssenh: Add stub implementations for a couple of functions.
by Hans Leidekker 07 Oct '20

07 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/dssenh.spec | 26 +++++++-------- dlls/dssenh/main.c | 70 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 13 deletions(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index c5c2545281..e40f398681 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -1,27 +1,27 @@ -@ stub CPAcquireContext -@ stub CPCreateHash +@ stdcall CPAcquireContext(ptr str long ptr) +@ stdcall CPCreateHash(ptr long ptr long ptr) @ stub CPDecrypt -@ stub CPDeriveKey -@ stub CPDestroyHash -@ stub CPDestroyKey +@ stdcall CPDeriveKey(ptr long ptr long ptr) +@ stdcall CPDestroyHash(ptr ptr) +@ stdcall CPDestroyKey(ptr ptr) @ stub CPDuplicateHash @ stub CPDuplicateKey @ stub CPEncrypt -@ stub CPExportKey -@ stub CPGenKey +@ stdcall CPExportKey(ptr ptr ptr long long ptr ptr) +@ stdcall CPGenKey(ptr long long ptr) @ stub CPGenRandom -@ stub CPGetHashParam +@ stdcall CPGetHashParam(ptr ptr long ptr ptr long) @ stub CPGetKeyParam @ stub CPGetProvParam @ stub CPGetUserKey -@ stub CPHashData +@ stdcall CPHashData(ptr ptr ptr long long) @ stub CPHashSessionKey -@ stub CPImportKey -@ stub CPReleaseContext +@ stdcall CPImportKey(ptr ptr long ptr long ptr) +@ stdcall CPReleaseContext(ptr long) @ stub CPSetHashParam @ stub CPSetKeyParam @ stub CPSetProvParam -@ stub CPSignHash -@ stub CPVerifySignature +@ stdcall CPSignHash(ptr ptr long wstr long ptr ptr) +@ stdcall CPVerifySignature(ptr ptr ptr long ptr wstr long) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index b60b3447a3..b8dab20751 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -21,10 +21,80 @@ #include "windef.h" #include "winbase.h" +#include "wincrypt.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dssenh); +BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) +{ + return FALSE; +} + +BOOL WINAPI CPReleaseContext( HCRYPTPROV hprov, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPGenKey( HCRYPTPROV hprov, ALG_ID algid, DWORD flags, HCRYPTKEY *ret_key ) +{ + return FALSE; +} + +BOOL WINAPI CPDestroyKey( HCRYPTPROV hprov, HCRYPTKEY hkey ) +{ + return FALSE; +} + +BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKEY hpubkey, DWORD flags, + HCRYPTKEY *ret_key ) +{ + return FALSE; +} + +BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DWORD blobtype, DWORD flags, + BYTE *data, DWORD *len ) +{ + return FALSE; +} + +BOOL WINAPI CPCreateHash( HCRYPTPROV hprov, ALG_ID algid, HCRYPTKEY hkey, DWORD flags, HCRYPTHASH *ret_hash ) +{ + return FALSE; +} + +BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) +{ + return FALSE; +} + +BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYTE *data, DWORD *len, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPDeriveKey( HCRYPTPROV hprov, ALG_ID algid, HCRYPTHASH hhash, DWORD flags, HCRYPTKEY *ret_key ) +{ + return FALSE; +} + +BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const WCHAR *desc, DWORD flags, BYTE *sig, + DWORD *siglen ) +{ + return FALSE; +} + +BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *sig, DWORD siglen, HCRYPTKEY hpubkey, + const WCHAR *desc, DWORD flags ) +{ + return FALSE; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); -- 2.28.0

1 0

[PATCH 7/7] wined3d: Implement stream output queries for the Vulkan adapter.
by Henri Verbeet 07 Oct '20

07 Oct '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 10 ++++++++ dlls/wined3d/query.c | 46 ++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index a4e394e811f..fa5aac28fd1 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1240,6 +1240,14 @@ bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, free_pools = &context_vk->free_pipeline_statistics_query_pools; break; + case WINED3D_QUERY_TYPE_SO_STATISTICS: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3: + free_pools = &context_vk->free_stream_output_statistics_query_pools; + break; + default: FIXME("Unhandled query type %#x.\n", type); return false; @@ -1303,6 +1311,7 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_occlusion_query_pools); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_timestamp_query_pools); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_pipeline_statistics_query_pools); + wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_stream_output_statistics_query_pools); wine_rb_destroy(&context_vk->bo_slab_available, wined3d_context_vk_destroy_bo_slab, context_vk); heap_free(context_vk->pending_queries.queries); heap_free(context_vk->submitted.buffers); @@ -3159,6 +3168,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi list_init(&context_vk->free_occlusion_query_pools); list_init(&context_vk->free_timestamp_query_pools); list_init(&context_vk->free_pipeline_statistics_query_pools); + list_init(&context_vk->free_stream_output_statistics_query_pools); wine_rb_init(&context_vk->render_passes, wined3d_render_pass_vk_compare); wine_rb_init(&context_vk->pipeline_layouts, wined3d_pipeline_layout_vk_compare); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index bb860db4ebb..5aca4a2c5a4 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1423,6 +1423,15 @@ bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, | VK_QUERY_PIPELINE_STATISTIC_COMPUTE_SHADER_INVOCATIONS_BIT; break; + case WINED3D_QUERY_TYPE_SO_STATISTICS: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3: + pool_info.queryType = VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT; + pool_info.pipelineStatistics = 0; + break; + default: FIXME("Unhandled query type %#x.\n", type); return false; @@ -1452,6 +1461,7 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, uint64_t occlusion; uint64_t timestamp; struct wined3d_query_data_pipeline_statistics pipeline_statistics; + struct wined3d_query_data_so_statistics so_statistics; } tmp, *result; if ((vr = VK_CALL(vkGetQueryPoolResults(device_vk->vk_device, pool_idx->pool_vk->vk_query_pool, @@ -1491,6 +1501,15 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, ps_result->cs_invocations += ps_tmp->cs_invocations; break; + case WINED3D_QUERY_TYPE_SO_STATISTICS: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3: + result->so_statistics.primitives_written += tmp.so_statistics.primitives_written; + result->so_statistics.primitives_generated += tmp.so_statistics.primitives_generated; + break; + default: FIXME("Unhandled query type %#x.\n", query_vk->q.type); return false; @@ -1516,7 +1535,12 @@ static void wined3d_query_vk_begin(struct wined3d_query_vk *query_vk, idx = query_vk->pool_idx.idx; VK_CALL(vkCmdResetQueryPool(vk_command_buffer, pool_vk->vk_query_pool, idx, 1)); - VK_CALL(vkCmdBeginQuery(vk_command_buffer, pool_vk->vk_query_pool, idx, query_vk->control_flags)); + if (query_vk->q.type >= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1 + && query_vk->q.type <= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3) + VK_CALL(vkCmdBeginQueryIndexedEXT(vk_command_buffer, pool_vk->vk_query_pool, idx, + query_vk->control_flags, query_vk->q.type - WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0)); + else + VK_CALL(vkCmdBeginQuery(vk_command_buffer, pool_vk->vk_query_pool, idx, query_vk->control_flags)); wined3d_context_vk_reference_query(context_vk, query_vk); } @@ -1530,7 +1554,12 @@ static void wined3d_query_vk_end(struct wined3d_query_vk *query_vk, pool_vk = query_vk->pool_idx.pool_vk; idx = query_vk->pool_idx.idx; - VK_CALL(vkCmdEndQuery(vk_command_buffer, pool_vk->vk_query_pool, idx)); + if (query_vk->q.type >= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1 + && query_vk->q.type <= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3) + VK_CALL(vkCmdEndQueryIndexedEXT(vk_command_buffer, pool_vk->vk_query_pool, + idx, query_vk->q.type - WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0)); + else + VK_CALL(vkCmdEndQuery(vk_command_buffer, pool_vk->vk_query_pool, idx)); } void wined3d_query_vk_resume(struct wined3d_query_vk *query_vk, struct wined3d_context_vk *context_vk) @@ -1803,6 +1832,19 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer data_size = sizeof(struct wined3d_query_data_pipeline_statistics); break; + case WINED3D_QUERY_TYPE_SO_STATISTICS: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3: + if (!wined3d_adapter_vk(device->adapter)->vk_info.supported[WINED3D_VK_EXT_TRANSFORM_FEEDBACK]) + { + WARN("Stream output queries not supported.\n"); + return WINED3DERR_NOTAVAILABLE; + } + data_size = sizeof(struct wined3d_query_data_so_statistics); + break; + default: FIXME("Unhandled query type %#x.\n", type); return WINED3DERR_NOTAVAILABLE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ae16545a772..d932f60fa95 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2515,6 +2515,7 @@ struct wined3d_context_vk struct list free_occlusion_query_pools; struct list free_timestamp_query_pools; struct list free_pipeline_statistics_query_pools; + struct list free_stream_output_statistics_query_pools; struct wined3d_retired_objects_vk retired; struct wine_rb_tree render_passes; -- 2.20.1

1 0

[PATCH 6/7] wined3d: Implement stream output for the Vulkan adapter.
by Henri Verbeet 07 Oct '20

07 Oct '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 86 +++++++++++++++++++++++++++++++--- dlls/wined3d/buffer.c | 13 ++++- dlls/wined3d/context_vk.c | 74 +++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 7 ++- dlls/wined3d/wined3d_vk.h | 9 ++++ 5 files changed, 181 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index e589699bcd9..5c219d45d3e 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -311,6 +311,7 @@ static HRESULT wined3d_select_vulkan_queue_family(const struct wined3d_adapter_v struct wined3d_physical_device_info { + VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; VkPhysicalDeviceFeatures2 features2; @@ -406,6 +407,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk_const(adapter); VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features; const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb_features; struct wined3d_physical_device_info physical_device_info; static const float priorities[] = {1.0f}; VkPhysicalDeviceFeatures2 *features2; @@ -429,8 +431,12 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi memset(&physical_device_info, 0, sizeof(physical_device_info)); + xfb_features = &physical_device_info.xfb_features; + xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; + vertex_divisor_features = &physical_device_info.vertex_divisor_features; vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; + vertex_divisor_features->pNext = xfb_features; features2 = &physical_device_info.features2; features2->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; @@ -482,15 +488,17 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi device_vk->timestamp_bits = timestamp_bits; device_vk->vk_info = *vk_info; -#define LOAD_DEVICE_PFN(name) \ +#define VK_DEVICE_PFN(name) \ if (!(device_vk->vk_info.vk_ops.name = (void *)VK_CALL(vkGetDeviceProcAddr(vk_device, #name)))) \ { \ WARN("Could not get device proc addr for '" #name "'.\n"); \ hr = E_FAIL; \ goto fail; \ } -#define VK_DEVICE_PFN LOAD_DEVICE_PFN +#define VK_DEVICE_EXT_PFN(name) \ + device_vk->vk_info.vk_ops.name = (void *)VK_CALL(vkGetDeviceProcAddr(vk_device, #name)); VK_DEVICE_FUNCS() +#undef VK_DEVICE_EXT_PFN #undef VK_DEVICE_PFN if (!wined3d_allocator_init(&device_vk->allocator, @@ -838,6 +846,11 @@ static VkAccessFlags vk_access_mask_from_buffer_usage(VkBufferUsageFlags usage) flags |= VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT; if (usage & VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT) flags |= VK_ACCESS_INDIRECT_COMMAND_READ_BIT; + if (usage & VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT) + flags |= VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT; + if (usage & VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT) + flags |= VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT + | VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT; return flags; } @@ -1572,6 +1585,7 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, struct wined3d_context_vk *context_vk; VkCommandBuffer vk_command_buffer; uint32_t instance_count; + unsigned int i; TRACE("device %p, state %p, parameters %p.\n", device, state, parameters); @@ -1589,6 +1603,30 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, return; } + if (context_vk->c.transform_feedback_active) + { + if (!context_vk->vk_so_counter_bo.vk_buffer) + { + struct wined3d_bo_vk *bo = &context_vk->vk_so_counter_bo; + + if (!wined3d_context_vk_create_bo(context_vk, ARRAY_SIZE(context_vk->vk_so_counters) * sizeof(uint32_t) * 2, + VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, bo)) + ERR("Failed to create counter BO.\n"); + for (i = 0; i < ARRAY_SIZE(context_vk->vk_so_counters); ++i) + { + context_vk->vk_so_counters[i] = bo->vk_buffer; + context_vk->vk_so_offsets[i] = bo->buffer_offset + i * sizeof(uint32_t) * 2; + } + } + + wined3d_context_vk_reference_bo(context_vk, &context_vk->vk_so_counter_bo); + if (context_vk->c.transform_feedback_paused) + VK_CALL(vkCmdBeginTransformFeedbackEXT(vk_command_buffer, 0, ARRAY_SIZE(context_vk->vk_so_counters), + context_vk->vk_so_counters, context_vk->vk_so_offsets)); + else + VK_CALL(vkCmdBeginTransformFeedbackEXT(vk_command_buffer, 0, 0, NULL, NULL)); + } + if (parameters->indirect) { struct wined3d_bo_vk *bo = &indirect_vk->bo; @@ -1627,6 +1665,14 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, parameters->u.direct.start_idx, parameters->u.direct.start_instance)); } + if (context_vk->c.transform_feedback_active) + { + VK_CALL(vkCmdEndTransformFeedbackEXT(vk_command_buffer, 0, ARRAY_SIZE(context_vk->vk_so_counters), + context_vk->vk_so_counters, context_vk->vk_so_offsets)); + context_vk->c.transform_feedback_paused = 1; + context_vk->c.transform_feedback_active = 0; + } + context_release(&context_vk->c); } @@ -1882,11 +1928,13 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) #define VK_INSTANCE_PFN LOAD_INSTANCE_PFN #define VK_INSTANCE_EXT_PFN LOAD_INSTANCE_OPT_PFN #define VK_DEVICE_PFN LOAD_INSTANCE_PFN +#define VK_DEVICE_EXT_PFN LOAD_INSTANCE_OPT_PFN VK_INSTANCE_FUNCS() VK_DEVICE_FUNCS() #undef VK_INSTANCE_PFN #undef VK_INSTANCE_EXT_PFN #undef VK_DEVICE_PFN +#undef VK_DEVICE_EXT_PFN #define MAP_INSTANCE_FUNCTION(core_pfn, ext_pfn) \ if (!vk_ops->core_pfn) \ @@ -2087,13 +2135,25 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk { const char *name; unsigned int core_since_version; + bool required; } info[] = { - {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u}, - {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1}, - {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1}, - {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u}, + {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, ~0u}, + {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u, true}, + {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1, true}, + {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1, true}, + {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u, true}, + }; + + static const struct + { + const char *name; + enum wined3d_vk_extension extension; + } + map[] = + { + {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, WINED3D_VK_EXT_TRANSFORM_FEEDBACK}, }; if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) @@ -2130,6 +2190,8 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk if (!found) { + if (!info[i].required) + continue; WARN("Required extension '%s' is not available.\n", info[i].name); goto done; } @@ -2145,6 +2207,18 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk } success = true; + for (i = 0; i < ARRAY_SIZE(map); ++i) + { + for (j = 0; j < enable_count; ++j) + { + if (!strcmp(enabled_extensions[j], map[i].name)) + { + vk_info->supported[map[i].extension] = TRUE; + break; + } + } + } + done: if (success) { diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b32d0160cc1..f2817eeee04 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1579,11 +1579,13 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf usage |= VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT; if (bind_flags & WINED3D_BIND_SHADER_RESOURCE) usage |= VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_STREAM_OUTPUT) + usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT; if (bind_flags & WINED3D_BIND_UNORDERED_ACCESS) usage |= VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT; if (bind_flags & WINED3D_BIND_INDIRECT_BUFFER) usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; - if (bind_flags & (WINED3D_BIND_STREAM_OUTPUT | WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) + if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; @@ -1711,9 +1713,18 @@ HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) { + const struct wined3d_vk_info *vk_info = &wined3d_adapter_vk(device->adapter)->vk_info; + TRACE("buffer_vk %p, device %p, desc %p, data %p, parent %p, parent_ops %p.\n", buffer_vk, device, desc, data, parent, parent_ops); + if ((desc->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + && !vk_info->supported[WINED3D_VK_EXT_TRANSFORM_FEEDBACK]) + { + WARN("The Vulkan implementation does not support transform feedback.\n"); + return WINED3DERR_INVALIDCALL; + } + if (desc->access & WINED3D_RESOURCE_ACCESS_GPU) buffer_vk->b.flags |= WINED3D_BUFFER_USE_BO; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 20a4522df56..a4e394e811f 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1297,6 +1297,8 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) if (context_vk->vk_framebuffer) VK_CALL(vkDestroyFramebuffer(device_vk->vk_device, context_vk->vk_framebuffer, NULL)); VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); + if (context_vk->vk_so_counter_bo.vk_buffer) + wined3d_context_vk_destroy_bo(context_vk, &context_vk->vk_so_counter_bo); wined3d_context_vk_cleanup_resources(context_vk); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_occlusion_query_pools); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_timestamp_query_pools); @@ -1466,6 +1468,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context wined3d_context_vk_end_current_render_pass(context_vk); context_vk->graphics.vk_pipeline = VK_NULL_HANDLE; context_vk->update_compute_pipeline = 1; + context_vk->update_stream_output = 1; context_vk->c.update_shader_resource_bindings = 1; context_vk->c.update_compute_shader_resource_bindings = 1; context_vk->c.update_unordered_access_view_bindings = 1; @@ -2238,6 +2241,51 @@ static void wined3d_context_vk_bind_vertex_buffers(struct wined3d_context_vk *co VK_CALL(vkCmdBindVertexBuffers(vk_command_buffer, first, count, buffers, offsets)); } +static void wined3d_context_vk_bind_stream_output_buffers(struct wined3d_context_vk *context_vk, + VkCommandBuffer vk_command_buffer, const struct wined3d_state *state, const struct wined3d_vk_info *vk_info) +{ + VkDeviceSize offsets[ARRAY_SIZE(state->stream_output)]; + VkDeviceSize sizes[ARRAY_SIZE(state->stream_output)]; + VkBuffer buffers[ARRAY_SIZE(state->stream_output)]; + const struct wined3d_stream_output *stream; + const VkDescriptorBufferInfo *buffer_info; + struct wined3d_buffer_vk *buffer_vk; + struct wined3d_buffer *buffer; + unsigned int i, first, count; + + first = 0; + count = 0; + for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) + { + stream = &state->stream_output[i]; + + if ((buffer = stream->buffer)) + { + buffer_vk = wined3d_buffer_vk(buffer); + buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); + wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); + buffers[count] = buffer_info->buffer; + if ((offsets[count] = stream->offset) == ~0u) + { + FIXME("Appending to stream output buffers not implemented.\n"); + offsets[count] = 0; + } + sizes[count] = buffer_info->range - offsets[count]; + offsets[count] += buffer_info->offset; + ++count; + continue; + } + + if (count) + VK_CALL(vkCmdBindTransformFeedbackBuffersEXT(vk_command_buffer, first, count, buffers, offsets, sizes)); + first = i + 1; + count = 0; + } + + if (count) + VK_CALL(vkCmdBindTransformFeedbackBuffersEXT(vk_command_buffer, first, count, buffers, offsets, sizes)); +} + static VkResult wined3d_context_vk_create_descriptor_pool(struct wined3d_device_vk *device_vk, const struct wined3d_vk_info *vk_info, VkDescriptorPool *vk_pool) { @@ -2892,6 +2940,21 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c context_invalidate_state(&context_vk->c, STATE_STREAMSRC); } + if (use_transform_feedback(state) && vk_info->supported[WINED3D_VK_EXT_TRANSFORM_FEEDBACK]) + { + for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) + { + if (!(buffer = state->stream_output[i].buffer)) + continue; + + wined3d_buffer_load(buffer, &context_vk->c, state); + wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); + if (!wined3d_buffer_vk(buffer)->bo_user.valid) + context_vk->update_stream_output = 1; + } + context_vk->c.transform_feedback_active = 1; + } + if (indexed || (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_INDEXBUFFER) && state->index_buffer)) { wined3d_buffer_load(state->index_buffer, &context_vk->c, state); @@ -2932,6 +2995,17 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STREAMSRC)) wined3d_context_vk_bind_vertex_buffers(context_vk, vk_command_buffer, state, vk_info); + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STREAM_OUTPUT)) + { + context_vk->update_stream_output = 1; + context_vk->c.transform_feedback_paused = 0; + } + if (context_vk->c.transform_feedback_active && context_vk->update_stream_output) + { + wined3d_context_vk_bind_stream_output_buffers(context_vk, vk_command_buffer, state, vk_info); + context_vk->update_stream_output = 0; + } + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_INDEXBUFFER) && state->index_buffer) { struct wined3d_buffer_vk *buffer_vk = wined3d_buffer_vk(state->index_buffer); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 778b26a6757..ae16545a772 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2465,7 +2465,8 @@ struct wined3d_context_vk const struct wined3d_vk_info *vk_info; uint32_t update_compute_pipeline : 1; - uint32_t padding : 31; + uint32_t update_stream_output : 1; + uint32_t padding : 30; struct { @@ -2505,6 +2506,10 @@ struct wined3d_context_vk VkSampleCountFlagBits sample_count; unsigned int rt_count; + VkBuffer vk_so_counters[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; + VkDeviceSize vk_so_offsets[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; + struct wined3d_bo_vk vk_so_counter_bo; + struct list active_queries; struct wined3d_pending_queries_vk pending_queries; struct list free_occlusion_query_pools; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index ae81fe945ee..0b6748ed0cf 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -172,6 +172,12 @@ VK_DEVICE_PFN(vkUnmapMemory) \ VK_DEVICE_PFN(vkUpdateDescriptorSets) \ VK_DEVICE_PFN(vkWaitForFences) \ + /* VK_EXT_transform_feedback */ \ + VK_DEVICE_EXT_PFN(vkCmdBeginQueryIndexedEXT) \ + VK_DEVICE_EXT_PFN(vkCmdBeginTransformFeedbackEXT) \ + VK_DEVICE_EXT_PFN(vkCmdBindTransformFeedbackBuffersEXT) \ + VK_DEVICE_EXT_PFN(vkCmdEndQueryIndexedEXT) \ + VK_DEVICE_EXT_PFN(vkCmdEndTransformFeedbackEXT) \ /* VK_KHR_swapchain */ \ VK_DEVICE_PFN(vkAcquireNextImageKHR) \ VK_DEVICE_PFN(vkCreateSwapchainKHR) \ @@ -186,11 +192,13 @@ struct vulkan_ops #define VK_INSTANCE_PFN DECLARE_VK_PFN #define VK_INSTANCE_EXT_PFN DECLARE_VK_PFN #define VK_DEVICE_PFN DECLARE_VK_PFN +#define VK_DEVICE_EXT_PFN DECLARE_VK_PFN VK_DEVICE_FUNCS() VK_INSTANCE_FUNCS() #undef VK_INSTANCE_PFN #undef VK_INSTANCE_EXT_PFN #undef VK_DEVICE_PFN +#undef VK_DEVICE_EXT_PFN PFN_vkCreateInstance vkCreateInstance; PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr; @@ -199,6 +207,7 @@ struct vulkan_ops enum wined3d_vk_extension { WINED3D_VK_EXT_NONE, + WINED3D_VK_EXT_TRANSFORM_FEEDBACK, WINED3D_VK_EXT_COUNT, }; -- 2.20.1

1 0

[PATCH 5/7] wined3d: Implement vertex shader stream output in the SPIR-V shader backend.
by Henri Verbeet 07 Oct '20

07 Oct '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/shader_spirv.c | 38 ++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index d729bf5c390..eb2647db12d 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -54,6 +54,7 @@ struct shader_spirv_resource_bindings SIZE_T vk_bindings_size, vk_binding_count; size_t binding_base[WINED3D_SHADER_TYPE_COUNT]; + enum wined3d_shader_type so_stage; }; struct shader_spirv_priv @@ -80,6 +81,7 @@ struct shader_spirv_compile_arguments struct shader_spirv_graphics_program_variant_vk { struct shader_spirv_compile_arguments compile_args; + const struct wined3d_stream_output_desc *so_desc; size_t binding_base; VkShaderModule vk_module; @@ -276,17 +278,14 @@ static const char *get_line(const char **ptr) } static void shader_spirv_init_shader_interface_vk(struct wined3d_shader_spirv_shader_interface *iface, - struct wined3d_shader *shader, const struct shader_spirv_resource_bindings *b) + struct wined3d_shader *shader, const struct shader_spirv_resource_bindings *b, + const struct wined3d_stream_output_desc *so_desc) { - enum wined3d_shader_type shader_type = shader->reg_maps.shader_version.type; - memset(iface, 0, sizeof(*iface)); iface->vkd3d_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; - if (shader_type == WINED3D_SHADER_TYPE_GEOMETRY && shader->u.gs.so_desc) + if (so_desc) { - const struct wined3d_stream_output_desc *so_desc = shader->u.gs.so_desc; - iface->xfb_info.type = VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO; iface->xfb_info.next = NULL; @@ -307,7 +306,7 @@ static void shader_spirv_init_shader_interface_vk(struct wined3d_shader_spirv_sh static VkShaderModule shader_spirv_compile(struct wined3d_context_vk *context_vk, struct wined3d_shader *shader, const struct shader_spirv_compile_arguments *args, - const struct shader_spirv_resource_bindings *bindings) + const struct shader_spirv_resource_bindings *bindings, const struct wined3d_stream_output_desc *so_desc) { struct wined3d_shader_spirv_compile_args compile_args; struct wined3d_shader_spirv_shader_interface iface; @@ -322,7 +321,7 @@ static VkShaderModule shader_spirv_compile(struct wined3d_context_vk *context_vk VkResult vr; int ret; - shader_spirv_init_shader_interface_vk(&iface, shader, bindings); + shader_spirv_init_shader_interface_vk(&iface, shader, bindings, so_desc); shader_type = shader->reg_maps.shader_version.type; shader_spirv_init_compile_args(&compile_args, &iface.vkd3d_interface, VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0, shader_type, args); @@ -383,13 +382,17 @@ static struct shader_spirv_graphics_program_variant_vk *shader_spirv_find_graphi struct shader_spirv_priv *priv, struct wined3d_context_vk *context_vk, struct wined3d_shader *shader, const struct wined3d_state *state, const struct shader_spirv_resource_bindings *bindings) { - size_t binding_base = bindings->binding_base[shader->reg_maps.shader_version.type]; + enum wined3d_shader_type shader_type = shader->reg_maps.shader_version.type; struct shader_spirv_graphics_program_variant_vk *variant_vk; + size_t binding_base = bindings->binding_base[shader_type]; + const struct wined3d_stream_output_desc *so_desc = NULL; struct shader_spirv_graphics_program_vk *program_vk; struct shader_spirv_compile_arguments args; size_t variant_count, i; shader_spirv_compile_arguments_init(&args, &context_vk->c, shader, state, context_vk->sample_count); + if (bindings->so_stage == shader_type) + so_desc = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]->u.gs.so_desc; if (!(program_vk = shader->backend_data)) return NULL; @@ -398,7 +401,7 @@ static struct shader_spirv_graphics_program_variant_vk *shader_spirv_find_graphi for (i = 0; i < variant_count; ++i) { variant_vk = &program_vk->variants[i]; - if (variant_vk->binding_base == binding_base + if (variant_vk->so_desc == so_desc && variant_vk->binding_base == binding_base && !memcmp(&variant_vk->compile_args, &args, sizeof(args))) return variant_vk; } @@ -410,7 +413,7 @@ static struct shader_spirv_graphics_program_variant_vk *shader_spirv_find_graphi variant_vk = &program_vk->variants[variant_count]; variant_vk->compile_args = args; variant_vk->binding_base = binding_base; - if (!(variant_vk->vk_module = shader_spirv_compile(context_vk, shader, &args, bindings))) + if (!(variant_vk->vk_module = shader_spirv_compile(context_vk, shader, &args, bindings, so_desc))) return NULL; ++program_vk->variant_count; @@ -434,7 +437,7 @@ static struct shader_spirv_compute_program_vk *shader_spirv_find_compute_program if (program->vk_module) return program; - if (!(program->vk_module = shader_spirv_compile(context_vk, shader, NULL, bindings))) + if (!(program->vk_module = shader_spirv_compile(context_vk, shader, NULL, bindings, NULL))) return NULL; if (!(layout = wined3d_context_vk_get_pipeline_layout(context_vk, @@ -671,6 +674,7 @@ static bool shader_spirv_resource_bindings_init(struct shader_spirv_resource_bin bindings->binding_count = 0; bindings->uav_counter_count = 0; bindings->vk_binding_count = 0; + bindings->so_stage = WINED3D_SHADER_TYPE_GEOMETRY; wined3d_bindings->count = 0; for (shader_type = 0; shader_type < WINED3D_SHADER_TYPE_COUNT; ++shader_type) @@ -681,9 +685,15 @@ static bool shader_spirv_resource_bindings_init(struct shader_spirv_resource_bin continue; if (shader_type == WINED3D_SHADER_TYPE_COMPUTE) + { descriptor_info = &((struct shader_spirv_compute_program_vk *)shader->backend_data)->descriptor_info; + } else + { descriptor_info = &((struct shader_spirv_graphics_program_vk *)shader->backend_data)->descriptor_info; + if (shader_type == WINED3D_SHADER_TYPE_GEOMETRY && !shader->function) + bindings->so_stage = WINED3D_SHADER_TYPE_VERTEX; + } vk_stage = vk_shader_stage_from_wined3d(shader_type); shader_visibility = vkd3d_shader_visibility_from_wined3d(shader_type); @@ -829,6 +839,8 @@ static void shader_spirv_select(void *shader_priv, struct wined3d_context *conte ERR("Failed to initialise shader resource bindings.\n"); goto fail; } + if (context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_GEOMETRY)) + context->shader_update_mask |= 1u << bindings->so_stage; layout_vk = wined3d_context_vk_get_pipeline_layout(context_vk, bindings->vk_bindings, bindings->vk_binding_count); context_vk->graphics.vk_set_layout = layout_vk->vk_set_layout; @@ -840,7 +852,7 @@ static void shader_spirv_select(void *shader_priv, struct wined3d_context *conte || binding_base[shader_type] == bindings->binding_base[shader_type])) continue; - if (!(shader = state->shader[shader_type])) + if (!(shader = state->shader[shader_type]) || !shader->function) { context_vk->graphics.vk_modules[shader_type] = VK_NULL_HANDLE; continue; -- 2.20.1

1 0

[PATCH 4/7] wined3d: Only store unique stream output descriptions.
by Henri Verbeet 07 Oct '20

07 Oct '20

This allows us to compare them by pointer. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 54 ++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 10 ++--- dlls/wined3d/shader.c | 77 +++++++++++++++++++++++++++------- dlls/wined3d/shader_spirv.c | 12 +++--- dlls/wined3d/wined3d_private.h | 16 +++++-- 5 files changed, 140 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b077d5317db..cc40125ac95 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -176,6 +176,13 @@ ULONG CDECL wined3d_device_incref(struct wined3d_device *device) return refcount; } +static void device_free_so_desc(struct wine_rb_entry *entry, void *context) +{ + struct wined3d_so_desc_entry *s = WINE_RB_ENTRY_VALUE(entry, struct wined3d_so_desc_entry, entry); + + heap_free(s); +} + static void device_leftover_sampler(struct wine_rb_entry *entry, void *context) { struct wined3d_sampler *sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); @@ -242,6 +249,7 @@ void wined3d_device_cleanup(struct wined3d_device *device) wine_rb_destroy(&device->rasterizer_states, device_leftover_rasterizer_state, NULL); wine_rb_destroy(&device->blend_states, device_leftover_blend_state, NULL); wine_rb_destroy(&device->depth_stencil_states, device_leftover_depth_stencil_state, NULL); + wine_rb_destroy(&device->so_descs, device_free_so_desc, NULL); wined3d_decref(device->wined3d); device->wined3d = NULL; @@ -5686,6 +5694,49 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso TRACE("Resource released.\n"); } +static int wined3d_so_desc_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct wined3d_stream_output_desc *desc = &WINE_RB_ENTRY_VALUE(entry, + struct wined3d_so_desc_entry, entry)->desc; + const struct wined3d_stream_output_desc *k = key; + unsigned int i; + int ret; + + if ((ret = (k->element_count - desc->element_count))) + return ret; + if ((ret = (k->buffer_stride_count - desc->buffer_stride_count))) + return ret; + if ((ret = (k->rasterizer_stream_idx - desc->rasterizer_stream_idx))) + return ret; + + for (i = 0; i < k->element_count; ++i) + { + const struct wined3d_stream_output_element *b = &desc->elements[i]; + const struct wined3d_stream_output_element *a = &k->elements[i]; + + if ((ret = (a->stream_idx - b->stream_idx))) + return ret; + if ((ret = strcmp(a->semantic_name, b->semantic_name))) + return ret; + if ((ret = (a->semantic_idx - b->semantic_idx))) + return ret; + if ((ret = (a->component_idx - b->component_idx))) + return ret; + if ((ret = (a->component_count - b->component_count))) + return ret; + if ((ret = (a->output_slot - b->output_slot))) + return ret; + } + + for (i = 0; i < k->buffer_stride_count; ++i) + { + if ((ret = (k->buffer_strides[i] - desc->buffer_strides[i]))) + return ret; + } + + return 0; +} + static int wined3d_sampler_compare(const void *key, const struct wine_rb_entry *entry) { const struct wined3d_sampler *sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); @@ -5773,6 +5824,7 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined fragment_pipeline = adapter->fragment_pipe; + wine_rb_init(&device->so_descs, wined3d_so_desc_compare); wine_rb_init(&device->samplers, wined3d_sampler_compare); wine_rb_init(&device->rasterizer_states, wined3d_rasterizer_state_compare); wine_rb_init(&device->blend_states, wined3d_blend_state_compare); @@ -5788,6 +5840,7 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined wine_rb_destroy(&device->rasterizer_states, NULL, NULL); wine_rb_destroy(&device->blend_states, NULL, NULL); wine_rb_destroy(&device->depth_stencil_states, NULL, NULL); + wine_rb_destroy(&device->so_descs, NULL, NULL); wined3d_decref(device->wined3d); return hr; } @@ -5815,6 +5868,7 @@ err: wine_rb_destroy(&device->rasterizer_states, NULL, NULL); wine_rb_destroy(&device->blend_states, NULL, NULL); wine_rb_destroy(&device->depth_stencil_states, NULL, NULL); + wine_rb_destroy(&device->so_descs, NULL, NULL); wined3d_decref(device->wined3d); return hr; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cdc36ce77d2..7423b2003a6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -859,7 +859,7 @@ static BOOL shader_glsl_generate_transform_feedback_varyings(struct wined3d_stri const char **varyings, unsigned int *varying_count, char *strings, unsigned int *strings_length, GLenum buffer_mode, struct wined3d_shader *shader) { - const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; + const struct wined3d_stream_output_desc *so_desc = shader->u.gs.so_desc; unsigned int buffer_idx, count, length, highest_output_slot, stride; unsigned int i, register_idx, component_idx; BOOL have_varyings_to_record = FALSE; @@ -948,7 +948,7 @@ static BOOL shader_glsl_generate_transform_feedback_varyings(struct wined3d_stri static void shader_glsl_init_transform_feedback(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, GLuint program_id, struct wined3d_shader *shader) { - const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; + const struct wined3d_stream_output_desc *so_desc = shader->u.gs.so_desc; const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_string_buffer *buffer; unsigned int i, count, length; @@ -956,7 +956,7 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context_gl char *strings; GLenum mode; - if (!so_desc->element_count) + if (!so_desc) return; if (gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) @@ -1005,7 +1005,7 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context_gl if (!shader_glsl_generate_transform_feedback_varyings(buffer, NULL, &count, NULL, &length, mode, shader)) { FIXME("No varyings to record, disabling transform feedback.\n"); - shader->u.gs.so_desc.element_count = 0; + shader->u.gs.so_desc = NULL; string_buffer_release(&priv->string_buffers, buffer); return; } @@ -7217,7 +7217,7 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl static void shader_glsl_generate_stream_output_setup(struct wined3d_string_buffer *buffer, const struct wined3d_shader *shader) { - const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; + const struct wined3d_stream_output_desc *so_desc = shader->u.gs.so_desc; unsigned int i, register_idx, component_idx; shader_addline(buffer, "out shader_in_out\n{\n"); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d3921d5a981..8843e6883fc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3137,10 +3137,6 @@ static void shader_cleanup(struct wined3d_shader *shader) heap_free(shader->u.hs.phases.fork); heap_free(shader->u.hs.phases.join); } - else if (shader->reg_maps.shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) - { - heap_free((void *)shader->u.gs.so_desc.elements); - } heap_free(shader->patch_constant_signature.elements); heap_free(shader->output_signature.elements); @@ -3749,13 +3745,67 @@ BOOL shader_get_stream_output_register_info(const struct wined3d_shader *shader, return TRUE; } +static HRESULT geometry_shader_init_so_desc(struct wined3d_geometry_shader *gs, struct wined3d_device *device, + const struct wined3d_stream_output_desc *so_desc) +{ + struct wined3d_so_desc_entry *s; + struct wine_rb_entry *entry; + unsigned int i; + size_t size; + char *name; + + if ((entry = wine_rb_get(&device->so_descs, so_desc))) + { + gs->so_desc = &WINE_RB_ENTRY_VALUE(entry, struct wined3d_so_desc_entry, entry)->desc; + return WINED3D_OK; + } + + size = FIELD_OFFSET(struct wined3d_so_desc_entry, elements[so_desc->element_count]); + for (i = 0; i < so_desc->element_count; ++i) + { + const char *n = so_desc->elements[i].semantic_name; + + if (n) + size += strlen(n) + 1; + } + if (!(s = heap_alloc(size))) + return E_OUTOFMEMORY; + + s->desc = *so_desc; + + memcpy(s->elements, so_desc->elements, so_desc->element_count * sizeof(*s->elements)); + s->desc.elements = s->elements; + + name = (char *)&s->elements[s->desc.element_count]; + for (i = 0; i < so_desc->element_count; ++i) + { + struct wined3d_stream_output_element *e = &s->elements[i]; + + if (!e->semantic_name) + continue; + + size = strlen(e->semantic_name) + 1; + memcpy(name, e->semantic_name, size); + e->semantic_name = name; + name += size; + } + + if (wine_rb_put(&device->so_descs, &s->desc, &s->entry) == -1) + { + heap_free(s); + return E_FAIL; + } + gs->so_desc = &s->desc; + + return WINED3D_OK; +} + static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, const struct wined3d_stream_output_desc *so_desc) { const struct wined3d_shader_frontend *fe = shader->frontend; const struct wined3d_shader_signature_element *output; unsigned int i, component_idx, register_idx, mask; - struct wined3d_stream_output_element *elements; struct wined3d_shader_version shader_version; const DWORD *ptr; void *fe_data; @@ -3795,16 +3845,9 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, return hr; } - if (!(elements = heap_calloc(so_desc->element_count, sizeof(*elements)))) - return E_OUTOFMEMORY; - - shader->u.gs.so_desc = *so_desc; - shader->u.gs.so_desc.elements = elements; - memcpy(elements, so_desc->elements, so_desc->element_count * sizeof(*elements)); - for (i = 0; i < so_desc->element_count; ++i) { - struct wined3d_stream_output_element *e = &elements[i]; + const struct wined3d_stream_output_element *e = &so_desc->elements[i]; if (!e->semantic_name) continue; @@ -3816,8 +3859,6 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, return E_INVALIDARG; } - e->semantic_name = output->semantic_name; - mask = ((1u << e->component_count) - 1) << component_idx; if ((output->mask & 0xff & mask) != mask) { @@ -3827,6 +3868,12 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, } } + if (FAILED(hr = geometry_shader_init_so_desc(&shader->u.gs, shader->device, so_desc))) + { + WARN("Failed to initialise stream output description, hr %#x.\n", hr); + return hr; + } + return WINED3D_OK; } diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 974fdab14eb..d729bf5c390 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -283,15 +283,17 @@ static void shader_spirv_init_shader_interface_vk(struct wined3d_shader_spirv_sh memset(iface, 0, sizeof(*iface)); iface->vkd3d_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; - if (shader_type == WINED3D_SHADER_TYPE_GEOMETRY && shader->u.gs.so_desc.element_count) + if (shader_type == WINED3D_SHADER_TYPE_GEOMETRY && shader->u.gs.so_desc) { + const struct wined3d_stream_output_desc *so_desc = shader->u.gs.so_desc; + iface->xfb_info.type = VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO; iface->xfb_info.next = NULL; - iface->xfb_info.elements = (const struct vkd3d_shader_transform_feedback_element *)shader->u.gs.so_desc.elements; - iface->xfb_info.element_count = shader->u.gs.so_desc.element_count; - iface->xfb_info.buffer_strides = shader->u.gs.so_desc.buffer_strides; - iface->xfb_info.buffer_stride_count = shader->u.gs.so_desc.buffer_stride_count; + iface->xfb_info.elements = (const struct vkd3d_shader_transform_feedback_element *)so_desc->elements; + iface->xfb_info.element_count = so_desc->element_count; + iface->xfb_info.buffer_strides = so_desc->buffer_strides; + iface->xfb_info.buffer_stride_count = so_desc->buffer_stride_count; iface->vkd3d_interface.next = &iface->xfb_info; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a4ab61b186b..778b26a6757 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3671,6 +3671,13 @@ struct wined3d_dummy_textures * wined3d_device_create() ignores it. */ #define WINED3DCREATE_MULTITHREADED 0x00000004 +struct wined3d_so_desc_entry +{ + struct wine_rb_entry entry; + struct wined3d_stream_output_desc desc; + struct wined3d_stream_output_element elements[1]; +}; + struct wined3d_device { LONG ref; @@ -3715,6 +3722,7 @@ struct wined3d_device struct list resources; /* a linked list to track resources created by the device */ struct list shaders; /* a linked list to track shaders (pixel and vertex) */ + struct wine_rb_tree so_descs; struct wine_rb_tree samplers, rasterizer_states, blend_states, depth_stencil_states; /* Render Target Support */ @@ -5327,7 +5335,7 @@ struct wined3d_geometry_shader unsigned int vertices_out; unsigned int instance_count; - struct wined3d_stream_output_desc so_desc; + const struct wined3d_stream_output_desc *so_desc; }; struct wined3d_pixel_shader @@ -5723,7 +5731,7 @@ static inline BOOL use_transform_feedback(const struct wined3d_state *state) if (!(shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY])) return FALSE; - return shader->u.gs.so_desc.element_count; + return !!shader->u.gs.so_desc; } static inline void context_apply_state(struct wined3d_context *context, @@ -5787,8 +5795,8 @@ static inline BOOL can_use_texture_swizzle(const struct wined3d_d3d_info *d3d_in static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geometry_shader) { - return geometry_shader - && geometry_shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM; + return geometry_shader && geometry_shader->u.gs.so_desc + && geometry_shader->u.gs.so_desc->rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM; } static inline DWORD wined3d_extract_bits(const DWORD *bitstream, -- 2.20.1

1 0

[PATCH 3/7] wined3d: Initialise the list of Vulkan device extensions during adapter initialisation.
by Henri Verbeet 07 Oct '20

07 Oct '20

There's no reason to wait until wined3d device creation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 174 ++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 99 insertions(+), 77 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 799ec2601e6..e589699bcd9 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -274,6 +274,7 @@ static void adapter_vk_destroy(struct wined3d_adapter *adapter) VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); wined3d_unload_vulkan(vk_info); wined3d_adapter_cleanup(&adapter_vk->a); + heap_free(adapter_vk->device_extensions); heap_free(adapter_vk); } @@ -397,82 +398,12 @@ static const struct wined3d_allocator_ops wined3d_allocator_vk_ops = .allocator_destroy_chunk = wined3d_allocator_vk_destroy_chunk, }; -static const struct -{ - const char *name; - unsigned int core_since_version; -} -vulkan_device_extensions[] = -{ - {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u}, - {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1}, - {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1}, - {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u}, -}; - -static bool enable_vulkan_device_extensions(VkPhysicalDevice physical_device, uint32_t *extension_count, - const char *enabled_extensions[], const struct wined3d_vk_info *vk_info) -{ - VkExtensionProperties *extensions = NULL; - bool success = false, found; - unsigned int i, j, count; - VkResult vr; - - *extension_count = 0; - - if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) - { - ERR("Failed to enumerate device extensions, vr %s.\n", wined3d_debug_vkresult(vr)); - goto done; - } - if (!(extensions = heap_calloc(count, sizeof(*extensions)))) - { - WARN("Out of memory.\n"); - goto done; - } - if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, extensions))) < 0) - { - ERR("Failed to enumerate device extensions, vr %s.\n", wined3d_debug_vkresult(vr)); - goto done; - } - - for (i = 0; i < ARRAY_SIZE(vulkan_device_extensions); ++i) - { - if (vulkan_device_extensions[i].core_since_version <= vk_info->api_version) - continue; - - for (j = 0, found = false; j < count; ++j) - { - if (!strcmp(extensions[j].extensionName, vulkan_device_extensions[i].name)) - { - found = true; - break; - } - } - - if (!found) - { - WARN("Required extension '%s' is not available.\n", vulkan_device_extensions[i].name); - goto done; - } - - TRACE("Enabling instance extension '%s'.\n", vulkan_device_extensions[i].name); - enabled_extensions[(*extension_count)++] = vulkan_device_extensions[i].name; - } - success = true; - -done: - heap_free(extensions); - return success; -} - static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk_const(adapter); - const char *enabled_device_extensions[ARRAY_SIZE(vulkan_device_extensions)]; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features; const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; struct wined3d_physical_device_info physical_device_info; @@ -533,13 +464,8 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi device_info.pQueueCreateInfos = &queue_info; device_info.enabledLayerCount = 0; device_info.ppEnabledLayerNames = NULL; - device_info.ppEnabledExtensionNames = enabled_device_extensions; - if (!enable_vulkan_device_extensions(physical_device, - &device_info.enabledExtensionCount, enabled_device_extensions, vk_info)) - { - hr = E_FAIL; - goto fail; - } + device_info.enabledExtensionCount = adapter_vk->device_extension_count; + device_info.ppEnabledExtensionNames = adapter_vk->device_extensions; device_info.pEnabledFeatures = &features2->features; if ((vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device))) < 0) @@ -2146,6 +2072,93 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; } +static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk *adapter_vk) +{ + VkPhysicalDevice physical_device = adapter_vk->physical_device; + struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + unsigned int count, enable_count, i, j; + const char **enabled_extensions = NULL; + VkExtensionProperties *extensions; + bool found, success = false; + SIZE_T enable_size = 0; + VkResult vr; + + static const struct + { + const char *name; + unsigned int core_since_version; + } + info[] = + { + {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u}, + {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1}, + {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1}, + {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u}, + }; + + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) + { + ERR("Failed to enumerate device extensions, vr %s.\n", wined3d_debug_vkresult(vr)); + return false; + } + + if (!(extensions = heap_calloc(count, sizeof(*extensions)))) + { + ERR("Failed to allocate extension properties array.\n"); + return false; + } + + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, extensions))) < 0) + { + ERR("Failed to enumerate device extensions, vr %s.\n", wined3d_debug_vkresult(vr)); + goto done; + } + + for (i = 0, enable_count = 0; i < ARRAY_SIZE(info); ++i) + { + if (info[i].core_since_version <= vk_info->api_version) + continue; + + for (j = 0, found = false; j < count; ++j) + { + if (!strcmp(extensions[j].extensionName, info[i].name)) + { + found = true; + break; + } + } + + if (!found) + { + WARN("Required extension '%s' is not available.\n", info[i].name); + goto done; + } + + TRACE("Enabling device extension '%s'.\n", info[i].name); + if (!wined3d_array_reserve((void **)&enabled_extensions, &enable_size, + enable_count + 1, sizeof(*enabled_extensions))) + { + ERR("Failed to allocate enabled extensions array.\n"); + goto done; + } + enabled_extensions[enable_count++] = info[i].name; + } + success = true; + +done: + if (success) + { + adapter_vk->device_extension_count = enable_count; + adapter_vk->device_extensions = enabled_extensions; + } + else + { + heap_free(enabled_extensions); + } + heap_free(extensions); + return success; +} + static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, unsigned int ordinal, unsigned int wined3d_creation_flags) { @@ -2167,6 +2180,9 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, if (!(adapter_vk->physical_device = get_vulkan_physical_device(vk_info))) goto fail_vulkan; + if (!wined3d_adapter_vk_init_device_extensions(adapter_vk)) + goto fail_vulkan; + memset(&id_properties, 0, sizeof(id_properties)); id_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; @@ -2184,7 +2200,10 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, luid = (LUID *)id_properties.deviceLUID; if (!wined3d_adapter_init(adapter, ordinal, luid, &wined3d_adapter_vk_ops)) + { + heap_free(adapter_vk->device_extensions); goto fail_vulkan; + } adapter->vertex_pipe = wined3d_spirv_vertex_pipe_init_vk(); adapter->fragment_pipe = wined3d_spirv_fragment_pipe_init_vk(); @@ -2210,6 +2229,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, fail: wined3d_adapter_cleanup(adapter); + heap_free(adapter_vk->device_extensions); fail_vulkan: VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); wined3d_unload_vulkan(vk_info); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1c783d28bc2..a4ab61b186b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3347,6 +3347,8 @@ struct wined3d_adapter_vk struct wined3d_adapter a; struct wined3d_vk_info vk_info; + unsigned int device_extension_count; + const char **device_extensions; VkPhysicalDevice physical_device; VkPhysicalDeviceLimits device_limits; -- 2.20.1

1 0

[PATCH 2/7] wined3d: Implement rasteriser discard for the Vulkan adapter.
by Henri Verbeet 07 Oct '20

07 Oct '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index aeb505ebfc6..20a4522df56 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1761,6 +1761,7 @@ static void wined3d_context_vk_update_rasterisation_state(const struct wined3d_c if (!state->rasterizer_state) { desc->depthClampEnable = VK_FALSE; + desc->rasterizerDiscardEnable = is_rasterization_disabled(state->shader[WINED3D_SHADER_TYPE_GEOMETRY]); desc->cullMode = VK_CULL_MODE_BACK_BIT; desc->frontFace = VK_FRONT_FACE_CLOCKWISE; desc->depthBiasEnable = VK_FALSE; @@ -1773,6 +1774,7 @@ static void wined3d_context_vk_update_rasterisation_state(const struct wined3d_c r = &state->rasterizer_state->desc; desc->depthClampEnable = !r->depth_clip; + desc->rasterizerDiscardEnable = is_rasterization_disabled(state->shader[WINED3D_SHADER_TYPE_GEOMETRY]); desc->cullMode = vk_cull_mode_from_wined3d(r->cull_mode); desc->frontFace = r->front_ccw ? VK_FRONT_FACE_COUNTER_CLOCKWISE : VK_FRONT_FACE_CLOCKWISE; @@ -2017,7 +2019,8 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } - if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER)) + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER) + || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY))) { wined3d_context_vk_update_rasterisation_state(context_vk, state, key); -- 2.20.1

1 0

[PATCH 1/7] wined3d: Copy the correct "binding_base" size in shader_spirv_select().
by Henri Verbeet 07 Oct '20

07 Oct '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/shader_spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index a4368a944ab..974fdab14eb 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -820,7 +820,7 @@ static void shader_spirv_select(void *shader_priv, struct wined3d_context *conte priv->fragment_pipe->fp_enable(context, !use_ps(state)); bindings = &priv->bindings; - memcpy(binding_base, bindings->binding_base, sizeof(bindings)); + memcpy(binding_base, bindings->binding_base, sizeof(bindings->binding_base)); if (!shader_spirv_resource_bindings_init(bindings, &context_vk->graphics.bindings, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE))) { -- 2.20.1

1 0

[PATCH] qedit: Block in the Null Renderer during rendering when paused.
by Gabriel Ivăncescu 07 Oct '20

07 Oct '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/qedit/nullrenderer.c | 24 ++ dlls/qedit/tests/nullrenderer.c | 521 ++++++++++++++++++++++++++++++++ 2 files changed, 545 insertions(+) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index c64d5e2..f1dbea2 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); struct null_renderer { struct strmbase_renderer renderer; + HANDLE run_event; }; static struct null_renderer *impl_from_strmbase_renderer(struct strmbase_renderer *iface) @@ -41,7 +42,14 @@ static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *ifac struct null_renderer *filter = impl_from_strmbase_renderer(iface); if (filter->renderer.filter.state == State_Paused) + { + const HANDLE events[2] = { filter->run_event, filter->renderer.flush_event }; + SetEvent(filter->renderer.state_event); + LeaveCriticalSection(&filter->renderer.csRenderLock); + WaitForMultipleObjects(2, events, FALSE, INFINITE); + EnterCriticalSection(&filter->renderer.csRenderLock); + } return S_OK; } @@ -56,14 +64,29 @@ static void null_renderer_destroy(struct strmbase_renderer *iface) { struct null_renderer *filter = impl_from_strmbase_renderer(iface); + CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); free(filter); } +static void null_renderer_start_stream(struct strmbase_renderer *iface) +{ + struct null_renderer *filter = impl_from_strmbase_renderer(iface); + SetEvent(filter->run_event); +} + +static void null_renderer_stop_stream(struct strmbase_renderer *iface) +{ + struct null_renderer *filter = impl_from_strmbase_renderer(iface); + ResetEvent(filter->run_event); +} + static const struct strmbase_renderer_ops renderer_ops = { .pfnCheckMediaType = NullRenderer_CheckMediaType, .pfnDoRenderSample = NullRenderer_DoRenderSample, + .renderer_start_stream = null_renderer_start_stream, + .renderer_stop_stream = null_renderer_stop_stream, .renderer_destroy = null_renderer_destroy, }; @@ -75,6 +98,7 @@ HRESULT null_renderer_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; strmbase_renderer_init(&object->renderer, outer, &CLSID_NullRenderer, L"In", &renderer_ops); + object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); TRACE("Created null renderer %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 8f26e47..01fda46 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "dshow.h" +#include "wine/strmbase.h" #include "wine/test.h" static IBaseFilter *create_null_renderer(void) @@ -420,6 +421,525 @@ static void test_enum_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; + IMediaSeeking IMediaSeeking_iface; +}; + +static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + + return index ? NULL : &filter->source.pin; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + + strmbase_source_cleanup(&filter->source); + strmbase_filter_cleanup(&filter->filter); +} + +static HRESULT testfilter_init_stream(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + HRESULT hr; + + hr = BaseOutputPinImpl_Active(&filter->source); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + return hr; +} + +static HRESULT testfilter_cleanup_stream(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + HRESULT hr; + + hr = BaseOutputPinImpl_Inactive(&filter->source); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + return hr; +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, + .filter_init_stream = testfilter_init_stream, + .filter_cleanup_stream = testfilter_cleanup_stream +}; + +static HRESULT testsource_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) +{ + static const VIDEOINFOHEADER source_format = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 32, + .bmiHeader.biHeight = -16, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 16, + .bmiHeader.biCompression = BI_RGB, + .bmiHeader.biSizeImage = 32 * 16 * 2 + }; + + if (index) + return S_FALSE; + + mt->majortype = MEDIATYPE_Video; + mt->subtype = MEDIASUBTYPE_RGB565; + mt->bFixedSizeSamples = TRUE; + mt->bTemporalCompression = FALSE; + mt->lSampleSize = source_format.bmiHeader.biSizeImage; + mt->formattype = FORMAT_VideoInfo; + mt->pUnk = NULL; + mt->cbFormat = sizeof(source_format); + mt->pbFormat = CoTaskMemAlloc(mt->cbFormat); + memcpy(mt->pbFormat, &source_format, mt->cbFormat); + return S_OK; +} + +static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->filter); + + if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &filter->IMediaSeeking_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static HRESULT WINAPI testsource_DecideBufferSize(struct strmbase_source *iface, + IMemAllocator *allocator, ALLOCATOR_PROPERTIES *requested) +{ + ALLOCATOR_PROPERTIES actual; + + if (!requested->cbAlign) + requested->cbAlign = 1; + + if (requested->cbBuffer < 32 * 16 * 2) + requested->cbBuffer = 32 * 16 * 2; + + if (!requested->cBuffers) + requested->cBuffers = 1; + + return IMemAllocator_SetProperties(allocator, requested, &actual); +} + +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) +{ + ALLOCATOR_PROPERTIES props = {0}; + HRESULT hr; + + hr = BaseOutputPinImpl_InitAllocator(iface, allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMemInputPin_GetAllocatorRequirements(peer, &props); + hr = testsource_DecideBufferSize(iface, *allocator, &props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + return IMemInputPin_NotifyAllocator(peer, *allocator, FALSE); +} + +static const struct strmbase_source_ops testsource_ops = +{ + .base.pin_get_media_type = testsource_get_media_type, + .base.pin_query_interface = testsource_query_interface, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideBufferSize = testsource_DecideBufferSize, + .pfnDecideAllocator = testsource_DecideAllocator +}; + +static struct testfilter *impl_from_IMediaSeeking(IMediaSeeking *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, IMediaSeeking_iface); +} + +static HRESULT WINAPI testseek_QueryInterface(IMediaSeeking *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IUnknown_QueryInterface(filter->filter.outer_unk, iid, out); +} + +static ULONG WINAPI testseek_AddRef(IMediaSeeking *iface) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IUnknown_AddRef(filter->filter.outer_unk); +} + +static ULONG WINAPI testseek_Release(IMediaSeeking *iface) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IUnknown_Release(filter->filter.outer_unk); +} + +static HRESULT WINAPI testseek_GetCapabilities(IMediaSeeking *iface, DWORD *caps) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_CheckCapabilities(IMediaSeeking *iface, DWORD *caps) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_IsFormatSupported(IMediaSeeking *iface, const GUID *format) +{ + if (winetest_debug > 1) trace("IMediaSeeking_IsFormatSupported(%s)\n", wine_dbgstr_guid(format)); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_QueryPreferredFormat(IMediaSeeking *iface, GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetTimeFormat(IMediaSeeking *iface, GUID *format) +{ + if (winetest_debug > 1) trace("IMediaSeeking_GetTimeFormat()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_IsUsingTimeFormat(IMediaSeeking *iface, const GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_SetTimeFormat(IMediaSeeking *iface, const GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetDuration(IMediaSeeking *iface, LONGLONG *duration) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) +{ + if (winetest_debug > 1) trace("IMediaSeeking_GetStopPosition()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_ConvertTimeFormat(IMediaSeeking *iface, LONGLONG *target, + const GUID *target_format, LONGLONG source, const GUID *source_format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_SetPositions(IMediaSeeking *iface, LONGLONG *current, + DWORD current_flags, LONGLONG *stop, DWORD stop_flags ) +{ + if (winetest_debug > 1) trace("IMediaSeeking_SetPositions()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetPositions(IMediaSeeking *iface, LONGLONG *current, LONGLONG *stop) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetAvailable(IMediaSeeking *iface, LONGLONG *earliest, LONGLONG *latest) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_SetRate(IMediaSeeking *iface, double rate) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetRate(IMediaSeeking *iface, double *rate) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetPreroll(IMediaSeeking *iface, LONGLONG *preroll) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IMediaSeekingVtbl testseek_vtbl = +{ + testseek_QueryInterface, + testseek_AddRef, + testseek_Release, + testseek_GetCapabilities, + testseek_CheckCapabilities, + testseek_IsFormatSupported, + testseek_QueryPreferredFormat, + testseek_GetTimeFormat, + testseek_IsUsingTimeFormat, + testseek_SetTimeFormat, + testseek_GetDuration, + testseek_GetStopPosition, + testseek_GetCurrentPosition, + testseek_ConvertTimeFormat, + testseek_SetPositions, + testseek_GetPositions, + testseek_GetAvailable, + testseek_SetRate, + testseek_GetRate, + testseek_GetPreroll +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); + filter->IMediaSeeking_iface.lpVtbl = &testseek_vtbl; +} + +struct frame_thread_params +{ + IMemInputPin *sink; + IMediaSample *sample; +}; + +static DWORD WINAPI frame_thread(void *arg) +{ + struct frame_thread_params *params = arg; + HRESULT hr; + + if (winetest_debug > 1) trace("%04x: Sending frame.\n", GetCurrentThreadId()); + hr = IMemInputPin_Receive(params->sink, params->sample); + if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr); + IMediaSample_Release(params->sample); + free(params); + return hr; +} + +static HANDLE send_frame(IMemInputPin *sink) +{ + struct frame_thread_params *params = malloc(sizeof(*params)); + REFERENCE_TIME start_time, end_time; + IMemAllocator *allocator; + IMediaSample *sample; + HANDLE thread; + HRESULT hr; + BYTE *data; + + hr = IMemInputPin_GetAllocator(sink, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + if (hr == VFW_E_NOT_COMMITTED) + { + IMemAllocator_Commit(allocator); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + } + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + memset(data, 0xaa, 32 * 16 * 2); + + hr = IMediaSample_SetActualDataLength(sample, 32 * 16 * 2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time = 0; + end_time = 400000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + params->sink = sink; + params->sample = sample; + thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); + + IMemAllocator_Release(allocator); + return thread; +} + +static HRESULT join_thread_(unsigned line, HANDLE thread) +{ + DWORD ret; + ok_(__FILE__, line)(!WaitForSingleObject(thread, 1000), "Wait failed.\n"); + GetExitCodeThread(thread, &ret); + CloseHandle(thread); + return ret; +} +#define join_thread(thread) join_thread_(__LINE__, thread) + +static void test_state(void) +{ + IBaseFilter *renderer = create_null_renderer(); + struct testfilter testfilter; + IMediaControl *control; + IGraphBuilder *graph; + OAFilterState state; + IMemInputPin *input; + IEnumPins *pins; + HANDLE thread; + HRESULT hr; + IPin *pin; + + testfilter_init(&testfilter); + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (void**)&graph); + ok(hr == S_OK, "Failed to create Filter Graph: %08x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &testfilter.filter.IBaseFilter_iface, L"Source"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, renderer, L"NullRenderer"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(renderer, &pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(pins, 1, &pin, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IEnumPins_Release(pins); + + hr = IGraphBuilder_Connect(graph, &testfilter.source.pin.IPin_iface, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_QueryInterface(testfilter.source.pin.peer, &IID_IMemInputPin, (void**)&input); + ok(hr == S_OK, "QueryInterface for IID_IMemInputPin failed: %08x\n", hr); + hr = IGraphBuilder_QueryInterface(graph, &IID_IMediaControl, (void**)&control); + ok(hr == S_OK, "QueryInterface for IID_IMediaControl failed: %08x\n", hr); + IBaseFilter_Release(&testfilter.filter.IBaseFilter_iface); + IBaseFilter_Release(renderer); + IGraphBuilder_Release(graph); + IPin_Release(pin); + + /* Pause should block */ + thread = send_frame(input); + hr = join_thread(thread); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + thread = send_frame(input); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test flushing */ + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMediaControl_Release(control); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -443,6 +963,7 @@ START_TEST(nullrenderer) test_aggregation(); test_media_types(); test_enum_media_types(); + test_state(); CoUninitialize(); } -- 2.21.0

1 0

[PATCH 2/2] riched20: Simplify SplitByBacktracking().
by Huw Davies 07 Oct '20

07 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/wrap.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index c3b5883dbf1..499ba934a06 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -498,7 +498,7 @@ static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, i static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem *p, int loc) { - ME_DisplayItem *piter = p, *pp; + ME_DisplayItem *new_run; int i, idesp, len; ME_Run *run = &p->member.run; @@ -509,9 +509,8 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem if (i) { /* don't split words */ i = reverse_find_whitespace( get_text( run, 0 ), i ); - pp = ME_MaximizeSplit(wc, p, i); - if (pp) - return pp; + new_run = ME_MaximizeSplit(wc, p, i); + if (new_run) return new_run; } TRACE("Must backtrack to split at: %s\n", debugstr_run( &p->member.run )); if (wc->pLastSplittableRun) @@ -528,20 +527,16 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem ME_UpdateRunFlags(wc->context->editor, run); assert((wc->pLastSplittableRun->member.run.nFlags & MERF_SPLITTABLE)); - piter = wc->pLastSplittableRun; - run = &piter->member.run; + p = wc->pLastSplittableRun; + run = &p->member.run; len = run->len; /* don't split words */ i = reverse_find_whitespace( get_text( run, 0 ), len ); if (i == len) i = reverse_find_non_whitespace( get_text( run, 0 ), len ); - if (i) { - ME_DisplayItem *piter2 = split_run_extents(wc, piter, i); - wc->pt = piter2->member.run.pt; - return piter2; - } - /* splittable = must have whitespaces */ - assert(0 == "Splittable, but no whitespaces"); + new_run = split_run_extents(wc, p, i); + wc->pt = new_run->member.run.pt; + return new_run; } else { @@ -553,24 +548,24 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem TRACE("Backtracking failed, trying desperate: %s\n", debugstr_run( &p->member.run )); /* OK, no better idea, so assume we MAY split words if we can split at all*/ if (idesp) - return split_run_extents(wc, piter, idesp); + return split_run_extents(wc, p, idesp); else - if (wc->pRowStart && piter != wc->pRowStart) + if (wc->pRowStart && p != wc->pRowStart) { /* don't need to break current run, because it's possible to split before this run */ wc->bOverflown = TRUE; - return piter; + return p; } else { /* split point inside first character - no choice but split after that char */ if (len != 1) { /* the run is more than 1 char, so we may split */ - return split_run_extents(wc, piter, 1); + return split_run_extents(wc, p, 1); } /* the run is one char, can't split it */ - return piter; + return p; } } -- 2.23.0

1 0

[PATCH 1/2] riched20: Simplify FindPixelPos().
by Huw Davies 07 Oct '20

07 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 212c9e9f992..0ed34372e38 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1011,6 +1011,7 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol, BOOL final_eop) { ME_DisplayItem *p = editor->pBuffer->pFirst->member.para.next_para; + ME_DisplayItem *row = NULL; BOOL isExact = TRUE; x -= editor->rcFormat.left; @@ -1022,42 +1023,40 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, /* find paragraph */ for (; p != editor->pBuffer->pLast; p = p->member.para.next_para) { - assert(p->type == diParagraph); if (y < p->member.para.pt.y + p->member.para.nHeight) { if (p->member.para.nFlags & MEPF_ROWSTART) p = ME_FindPixelPosInTableRow(x, y, p); y -= p->member.para.pt.y; - p = ME_FindItemFwd(p, diStartRow); + row = ME_FindItemFwd(p, diStartRow); break; - } else if (p->member.para.nFlags & MEPF_ROWSTART) { + } + else if (p->member.para.nFlags & MEPF_ROWSTART) + { p = ME_GetTableRowEnd(p); } } /* find row */ - for (; p != editor->pBuffer->pLast; ) + while (row) { - ME_DisplayItem *pp; - assert(p->type == diStartRow); - if (y < p->member.row.pt.y + p->member.row.nHeight) break; - pp = ME_FindItemFwd(p, diStartRow); - if (!pp) break; - p = pp; + ME_DisplayItem *next_row; + + if (y < row->member.row.pt.y + row->member.row.nHeight) break; + next_row = ME_FindItemFwd(row, diStartRow); + if (!next_row) break; + row = next_row; } - if (p == editor->pBuffer->pLast && !final_eop) + + if (!row && !final_eop) { /* The position is below the last paragraph, so the last row will be used * rather than the end of the text, so the x position will be used to * determine the offset closest to the pixel position. */ isExact = FALSE; - p = ME_FindItemBack(p, diStartRow); - if (!p) p = editor->pBuffer->pLast; + row = ME_FindItemBack(p, diStartRow); } - assert( p->type == diStartRow || p == editor->pBuffer->pLast ); - - if( p->type == diStartRow ) - return ME_FindRunInRow( editor, p, x, result, is_eol ) && isExact; + if (row) return ME_FindRunInRow( editor, row, x, result, is_eol ) && isExact; ME_SetCursorToEnd(editor, result, TRUE); return FALSE; -- 2.23.0

1 0

[PATCH vkd3d] vkd3d-compiler: Use the correct array count in validate_target_type().
by Zebediah Figura 07 Oct '20

07 Oct '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index b38960ac..50e8ee3f 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -367,7 +367,7 @@ static bool validate_target_type( const enum vkd3d_shader_target_type *supported_types = vkd3d_shader_get_supported_target_types(source_type, &count); - for (i = 0; i < ARRAY_SIZE(target_type_info); ++i) + for (i = 0; i < count; ++i) { if (target_type == supported_types[i]) return true; -- 2.28.0

3 2

[PATCH 1/5] evr/tests: Add some tests for presenter's GetNativeVideoSize().
by Nikolay Sivov 07 Oct '20

07 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/tests/Makefile.in | 2 +- dlls/evr/tests/evr.c | 55 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in index 5bd82277d1b..c5db2226ebc 100644 --- a/dlls/evr/tests/Makefile.in +++ b/dlls/evr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = evr.dll -IMPORTS = dxva2 mfplat mfuuid strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32 +IMPORTS = dxva2 mfplat mfuuid mf strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32 C_SRCS = \ evr.c diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 70c7053efdf..ce2803bcb34 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1562,6 +1562,8 @@ static void test_presenter_native_video_size(void) IMFTransform *mixer; SIZE size, ratio; HRESULT hr; + IMFVideoMediaType *video_type; + IDirect3DDeviceManager9 *dm; hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); @@ -1594,6 +1596,27 @@ todo_wine { hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* Configure mixer primary stream. */ + hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)dm); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDirect3DDeviceManager9_Release(dm); + + hr = pMFCreateVideoMediaTypeFromSubtype(&MFVideoFormat_RGB32, &video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(mixer, 0, (IMFMediaType *)video_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Native video size is cached on initialization. */ init_test_host(&host, mixer, presenter); hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, &host.IMFTopologyServiceLookup_iface); @@ -1602,9 +1625,37 @@ todo_wine { hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(size.cx == 0 && size.cy == 0, "Unexpected size.\n"); - ok(ratio.cx == 0 && ratio.cy == 0, "Unexpected ratio.\n"); + ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, + "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); +} + /* Update input type. */ + hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)320 << 32 | 240); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(mixer, 0, (IMFMediaType *)video_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, + "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); } + /* Negotiating types updates native video size. */ + hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.cx == 320 && size.cy == 240, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, + "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); +} + IMFVideoMediaType_Release(video_type); IMFVideoDisplayControl_Release(display_control); IMFVideoPresenter_Release(presenter); IMFTransform_Release(mixer); -- 2.28.0

1 4

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 07 Oct '20

07 Oct '20

1 0

[PATCH v2] xactengine3_7: Initial IXACT3Engine tests
by Alistair Leslie-Hughes 07 Oct '20

07 Oct '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure.ac | 1 + dlls/xactengine3_7/tests/Makefile.in | 5 ++ dlls/xactengine3_7/tests/xact3.c | 100 +++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 dlls/xactengine3_7/tests/Makefile.in create mode 100644 dlls/xactengine3_7/tests/xact3.c diff --git a/configure.ac b/configure.ac index 865aa924d07..a57697a0ddf 100644 --- a/configure.ac +++ b/configure.ac @@ -3915,6 +3915,7 @@ WINE_CONFIG_MAKEFILE(dlls/xactengine3_4) WINE_CONFIG_MAKEFILE(dlls/xactengine3_5) WINE_CONFIG_MAKEFILE(dlls/xactengine3_6) WINE_CONFIG_MAKEFILE(dlls/xactengine3_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine3_7/tests) WINE_CONFIG_MAKEFILE(dlls/xapofx1_1) WINE_CONFIG_MAKEFILE(dlls/xapofx1_2) WINE_CONFIG_MAKEFILE(dlls/xapofx1_3) diff --git a/dlls/xactengine3_7/tests/Makefile.in b/dlls/xactengine3_7/tests/Makefile.in new file mode 100644 index 00000000000..c32b2562546 --- /dev/null +++ b/dlls/xactengine3_7/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = xactengine3_7.dll +IMPORTS = ole32 + +C_SRCS = \ + xact3.c diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c new file mode 100644 index 00000000000..9b0d3defb09 --- /dev/null +++ b/dlls/xactengine3_7/tests/xact3.c @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <math.h> +#include <limits.h> +#include <float.h> + +#define COBJMACROS +#include "wine/test.h" + +#include "x3daudio.h" + +#include "initguid.h" +#include "xact3.h" + +DEFINE_GUID(IID_IXACT3Engine30, 0x9e33f661, 0x2d07, 0x43ec, 0x97, 0x04, 0xbb, 0xcb, 0x71, 0xa5, 0x49, 0x72); +DEFINE_GUID(IID_IXACT3Engine31, 0xe72c1b9a, 0xd717, 0x41c0, 0x81, 0xa6, 0x50, 0xeb, 0x56, 0xe8, 0x06, 0x49); + +DEFINE_GUID(CLSID_XACTEngine30, 0x3b80ee2a, 0xb0f5, 0x4780, 0x9e, 0x30, 0x90, 0xcb, 0x39, 0x68, 0x5b, 0x03); +DEFINE_GUID(CLSID_XACTEngine31, 0x962f5027, 0x99be, 0x4692, 0xa4, 0x68, 0x85, 0x80, 0x2c, 0xf8, 0xde, 0x61); +DEFINE_GUID(CLSID_XACTEngine32, 0xd3332f02, 0x3dd0, 0x4de9, 0x9a, 0xec, 0x20, 0xd8, 0x5c, 0x41, 0x11, 0xb6); +DEFINE_GUID(CLSID_XACTEngine33, 0x94c1affa, 0x66e7, 0x4961, 0x95, 0x21, 0xcf, 0xde, 0xf3, 0x12, 0x8d, 0x4f); +DEFINE_GUID(CLSID_XACTEngine34, 0x0977d092, 0x2d95, 0x4e43, 0x8d, 0x42, 0x9d, 0xdc, 0xc2, 0x54, 0x5e, 0xd5); +DEFINE_GUID(CLSID_XACTEngine35, 0x074b110f, 0x7f58, 0x4743, 0xae, 0xa5, 0x12, 0xf1, 0x5b, 0x50, 0x74, 0xed); +DEFINE_GUID(CLSID_XACTEngine36, 0x248d8a3b, 0x6256, 0x44d3, 0xa0, 0x18, 0x2a, 0xc9, 0x6c, 0x45, 0x9f, 0x47); + +struct xact_interfaces +{ + REFGUID clsid; + REFIID iid; + HRESULT expected; +} xact_interfaces[] = +{ + {&CLSID_XACTEngine30, &IID_IXACT3Engine30, S_OK }, + {&CLSID_XACTEngine30, &IID_IXACT3Engine31, E_NOINTERFACE}, + {&CLSID_XACTEngine30, &IID_IXACT3Engine, E_NOINTERFACE }, + + /* Version 3.1 to 3.4 use the same inteface */ + {&CLSID_XACTEngine31, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine32, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine33, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine34, &IID_IXACT3Engine31, S_OK }, + + /* Version 3.5 to 3.7 use the same inteface */ + {&CLSID_XACTEngine35, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine35, &IID_IXACT3Engine, S_OK }, + + {&CLSID_XACTEngine36, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine36, &IID_IXACT3Engine, S_OK }, + + {&CLSID_XACTEngine, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine, &IID_IXACT3Engine, S_OK }, + {&CLSID_XACTEngine, &IID_IUnknown, S_OK }, +}; + +static void test_interfaces(void) +{ + IUnknown *unk; + HRESULT hr; + int i; + + for (i = 0; i < ARRAY_SIZE(xact_interfaces); i++) + { + hr = CoCreateInstance(xact_interfaces[i].clsid, NULL, CLSCTX_INPROC_SERVER, + xact_interfaces[i].iid, (void**)&unk); + if (hr == REGDB_E_CLASSNOTREG) + { + trace("%d %s not registered. Skipping\n", i, wine_dbgstr_guid(xact_interfaces[i].clsid) ); + continue; + } + ok(hr == xact_interfaces[i].expected, "%d, Unexpected value 0x%08x\n", i, hr); + if (hr == S_OK) + IUnknown_Release(unk); + } +} + +START_TEST(xact3) +{ + CoInitialize(NULL); + + test_interfaces(); + + CoUninitialize(); +} -- 2.28.0

1 0

[PATCH] tzres: Add Cuba Time Zone.
by Daniel Lehman 07 Oct '20

07 Oct '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/tzres/tzres.rc | 2 ++ loader/wine.inf.in | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/tzres/tzres.rc b/dlls/tzres/tzres.rc index 4763aa63ebf..f7eebe73393 100644 --- a/dlls/tzres/tzres.rc +++ b/dlls/tzres/tzres.rc @@ -86,6 +86,8 @@ STRINGTABLE 62305 "Chatham Islands Daylight Time" 160 "China Standard Time" 161 "China Daylight Time" + 17136 "Cuba Standard Time" + 17137 "Cuba Daylight Time" 50384 "Dateline Standard Time" 50385 "Dateline Daylight Time" 62720 "E. Africa Standard Time" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index f3ad3ce754f..a1794742677 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2970,6 +2970,24 @@ HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"MUI_Dlt",,"@tzres.dll,-1 HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"MUI_Std",,"@tzres.dll,-160" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Std",,"China Standard Time" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"Display",,"America/Havana" +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"Dlt",,"Cuba Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"MUI_Dlt",,"@tzres.dll,-17137" +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"MUI_Std",,"@tzres.dll,-17136" +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"Std",,"Cuba Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2008",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2009",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2010",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2011",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,02,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2012",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2013",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"FirstEntry",0x10001,"2004" +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"LastEntry",0x10001,"2013" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"Display",,"Etc/GMT+12" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"Dlt",,"Dateline Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"MUI_Dlt",,"@tzres.dll,-50385" -- 2.25.1

1 0

[PATCH 1/5] winegstreamer: Use RGB15/16 formats instead of BGR15/16.
by Anton Baskanov 07 Oct '20

07 Oct '20

Gstreamer stores the first component in the most significant bits, same as DirectShow. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index acb15dc9238..5b5add409c7 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -194,11 +194,11 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE amt->subtype = MEDIASUBTYPE_RGB24; bih->biBitCount = 24; break; - case GST_VIDEO_FORMAT_BGR16: + case GST_VIDEO_FORMAT_RGB16: amt->subtype = MEDIASUBTYPE_RGB565; bih->biBitCount = 16; break; - case GST_VIDEO_FORMAT_BGR15: + case GST_VIDEO_FORMAT_RGB15: amt->subtype = MEDIASUBTYPE_RGB555; bih->biBitCount = 16; break; @@ -380,8 +380,8 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) {&MEDIASUBTYPE_ARGB32, GST_VIDEO_FORMAT_BGRA}, {&MEDIASUBTYPE_RGB32, GST_VIDEO_FORMAT_BGRx}, {&MEDIASUBTYPE_RGB24, GST_VIDEO_FORMAT_BGR}, - {&MEDIASUBTYPE_RGB565, GST_VIDEO_FORMAT_BGR16}, - {&MEDIASUBTYPE_RGB555, GST_VIDEO_FORMAT_BGR15}, + {&MEDIASUBTYPE_RGB565, GST_VIDEO_FORMAT_RGB16}, + {&MEDIASUBTYPE_RGB555, GST_VIDEO_FORMAT_RGB15}, }; const VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)mt->pbFormat; -- 2.17.1

3 9

[PATCH] winemac: Remove unused GetCurrentProcess() call.
by Brendan Shanks 07 Oct '20

07 Oct '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/cocoa_app.m | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b4dcbfff473..e296d4b4af0 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -19,7 +19,6 @@ */ #import <Carbon/Carbon.h> -#include <dlfcn.h> #import "cocoa_app.h" #import "cocoa_event.h" @@ -1332,8 +1331,6 @@ CGEventRef WineAppEventTapCallBack(CGEventTapProxy proxy, CGEventType type, - (BOOL) installEventTap { - ProcessSerialNumber psn; - OSErr err; CGEventMask mask = CGEventMaskBit(kCGEventLeftMouseDown) | CGEventMaskBit(kCGEventLeftMouseUp) | CGEventMaskBit(kCGEventRightMouseDown) | @@ -1346,31 +1343,10 @@ - (BOOL) installEventTap CGEventMaskBit(kCGEventOtherMouseDragged) | CGEventMaskBit(kCGEventScrollWheel); CFRunLoopSourceRef source; - void* appServices; - OSErr (*pGetCurrentProcess)(ProcessSerialNumber* PSN); if (cursorClippingEventTap) return TRUE; - // We need to get the Mac GetCurrentProcess() from the ApplicationServices - // framework with dlsym() because the Win32 function of the same name - // obscures it. - appServices = dlopen("/System/Library/Frameworks/ApplicationServices.framework/ApplicationServices", RTLD_LAZY); - if (!appServices) - return FALSE; - - pGetCurrentProcess = dlsym(appServices, "GetCurrentProcess"); - if (!pGetCurrentProcess) - { - dlclose(appServices); - return FALSE; - } - - err = pGetCurrentProcess(&psn); - dlclose(appServices); - if (err != noErr) - return FALSE; - // We create an annotated session event tap rather than a process-specific // event tap because we need to programmatically move the cursor even when // mouse moves are directed to other processes. We disable our tap when -- 2.26.2

2 2

[PATCH] quartz: Use wide-char string literals.
by Michael Stefaniuc 07 Oct '20

07 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/filesource.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 79df639ab4a..cc252c0e0e0 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -183,9 +183,7 @@ static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file) BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID *source_clsid) { - WCHAR extensions_path[278] = {'M','e','d','i','a',' ','T','y','p','e','\\','E','x','t','e','n','s','i','o','n','s','\\',0}; - static const WCHAR wszExtensions[] = {'E','x','t','e','n','s','i','o','n','s',0}; - static const WCHAR wszMediaType[] = {'M','e','d','i','a',' ','T','y','p','e',0}; + WCHAR extensions_path[278] = L"Media Type\\Extensions\\"; DWORD majortype_idx, size; const WCHAR *ext; HKEY parent_key; @@ -223,7 +221,7 @@ BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID return FALSE; } - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszMediaType, 0, KEY_READ, &parent_key)) + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Media Type", 0, KEY_READ, &parent_key)) { CloseHandle(file); return FALSE; @@ -239,7 +237,7 @@ BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID if (RegEnumKeyExW(parent_key, majortype_idx, majortype_str, &size, NULL, NULL, NULL, NULL)) break; - if (!wcscmp(majortype_str, wszExtensions)) + if (!wcscmp(majortype_str, L"Extensions")) continue; if (RegOpenKeyExW(parent_key, majortype_str, 0, KEY_READ, &majortype_key)) -- 2.26.2

2 1

[PATCH] atl: Use wide-char string literals.
by Michael Stefaniuc 07 Oct '20

07 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Includes non trivial manual changes, there might be dragons... dlls/atl/atl.c | 20 +++++--------- dlls/atl/atl_ax.c | 35 +++++++++++------------- dlls/atl/registrar.c | 60 +++++++++++++++-------------------------- dlls/atl/tests/atl_ax.c | 3 +-- 4 files changed, 44 insertions(+), 74 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 358986d7a4c..7529425b7ee 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -123,7 +123,6 @@ HRESULT WINAPI AtlUnmarshalPtr(IStream *stm, const IID *iid, IUnknown **ppUnk) */ HDC WINAPI AtlCreateTargetDC( HDC hdc, DVTARGETDEVICE *dv ) { - static const WCHAR displayW[] = {'d','i','s','p','l','a','y',0}; const WCHAR *driver = NULL, *device = NULL, *port = NULL; DEVMODEW *devmode = NULL; @@ -139,7 +138,7 @@ HDC WINAPI AtlCreateTargetDC( HDC hdc, DVTARGETDEVICE *dv ) else { if (hdc) return hdc; - driver = displayW; + driver = L"display"; } return CreateDCW( driver, device, port, devmode ); } @@ -342,12 +341,10 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, WCHAR *path; HRESULT hres; - static const WCHAR tlb_extW[] = {'.','t','l','b',0}; - TRACE("(%p %s %p %p)\n", inst, debugstr_w(lpszIndex), pbstrPath, ppTypeLib); index_len = lpszIndex ? lstrlenW(lpszIndex) : 0; - path = heap_alloc((MAX_PATH+index_len)*sizeof(WCHAR) + sizeof(tlb_extW)); + path = heap_alloc((MAX_PATH+index_len)*sizeof(WCHAR) + sizeof(L".tlb")); if(!path) return E_OUTOFMEMORY; @@ -367,7 +364,7 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, for(ptr = path+path_len-1; ptr > path && *ptr != '\\' && *ptr != '.'; ptr--); if(*ptr != '.') ptr = path+path_len; - memcpy(ptr, tlb_extW, sizeof(tlb_extW)); + lstrcpyW(ptr, L".tlb"); hres = LoadTypeLib(path, &typelib); } @@ -781,20 +778,15 @@ HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID clsid, const struct _AT } if(!reg) { - WCHAR reg_path[256] = {'C','L','S','I','D','\\'}, *ptr = reg_path+6; - - static const WCHAR implemented_catW[] = - {'I','m','p','l','e','m','e','n','t','e','d',' ','C','a','t','e','g','o','r','i','e','s',0}; - static const WCHAR required_catW[] = - {'R','e','q','u','i','r','e','d',' ','C','a','t','e','g','o','r','i','e','s',0}; + WCHAR reg_path[256] = L"CLSID\\", *ptr = reg_path+6; ptr += StringFromGUID2(clsid, ptr, 64)-1; *ptr++ = '\\'; - memcpy(ptr, implemented_catW, sizeof(implemented_catW)); + lstrcpyW(ptr, L"Implemented Categories"); RegDeleteKeyW(HKEY_CLASSES_ROOT, reg_path); - memcpy(ptr, required_catW, sizeof(required_catW)); + lstrcpyW(ptr, L"Required Categories"); RegDeleteKeyW(HKEY_CLASSES_ROOT, reg_path); } diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 3bb9dbc22df..f180f5e2b40 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -55,8 +55,6 @@ typedef struct IOCS { BOOL fActive, fInPlace, fWindowless; } IOCS; -static const WCHAR wine_atl_iocsW[] = {'_','_','W','I','N','E','_','A','T','L','_','I','O','C','S','\0'}; - /********************************************************************** * AtlAxWin class window procedure */ @@ -90,20 +88,20 @@ BOOL WINAPI AtlAxWinInit(void) WNDCLASSEXW wcex; #if _ATL_VER <= _ATL_VER_30 -#define ATL_NAME_SUFFIX 0 +#define ATL_NAME_SUFFIX #elif _ATL_VER == _ATL_VER_80 -#define ATL_NAME_SUFFIX '8','0',0 +#define ATL_NAME_SUFFIX L"800" #elif _ATL_VER == _ATL_VER_90 -#define ATL_NAME_SUFFIX '9','0',0 +#define ATL_NAME_SUFFIX L"900" #elif _ATL_VER == _ATL_VER_100 -#define ATL_NAME_SUFFIX '1','0','0',0 +#define ATL_NAME_SUFFIX L"1000" #elif _ATL_VER == _ATL_VER_110 -#define ATL_NAME_SUFFIX '1','1','0',0 +#define ATL_NAME_SUFFIX L"1100" #else #error Unsupported version #endif - static const WCHAR AtlAxWinW[] = {'A','t','l','A','x','W','i','n',ATL_NAME_SUFFIX}; + static const WCHAR AtlAxWinW[] = L"AtlAxWin" ATL_NAME_SUFFIX; FIXME("version %04x semi-stub\n", _ATL_VER); @@ -127,7 +125,7 @@ BOOL WINAPI AtlAxWinInit(void) return FALSE; if(_ATL_VER > _ATL_VER_30) { - static const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX}; + static const WCHAR AtlAxWinLicW[] = L"AtlAxWinLic" ATL_NAME_SUFFIX; wcex.lpszClassName = AtlAxWinLicW; if ( !RegisterClassExW( &wcex ) ) @@ -152,7 +150,7 @@ static HRESULT IOCS_Detach( IOCS *This ) /* remove subclassing */ if ( This->hWnd ) { SetWindowLongPtrW( This->hWnd, GWLP_WNDPROC, (ULONG_PTR) This->OrigWndProc ); - RemovePropW( This->hWnd, wine_atl_iocsW); + RemovePropW( This->hWnd, L"__WINE_ATL_IOCS" ); This->hWnd = NULL; } if ( This->control ) @@ -906,7 +904,7 @@ static LRESULT IOCS_OnWndProc( IOCS *This, HWND hWnd, UINT uMsg, WPARAM wParam, static LRESULT CALLBACK AtlHost_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) { - IOCS *This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); + IOCS *This = (IOCS*) GetPropW( hWnd, L"__WINE_ATL_IOCS" ); return IOCS_OnWndProc( This, hWnd, wMsg, wParam, lParam ); } @@ -915,7 +913,7 @@ static HRESULT IOCS_Attach( IOCS *This, HWND hWnd, IUnknown *pUnkControl ) /* su This->hWnd = hWnd; IUnknown_QueryInterface( pUnkControl, &IID_IOleObject, (void**)&This->control ); IOleObject_SetClientSite( This->control, &This->IOleClientSite_iface ); - SetPropW( hWnd, wine_atl_iocsW, This ); + SetPropW( hWnd, L"__WINE_ATL_IOCS", This ); This->OrigWndProc = (WNDPROC)SetWindowLongPtrW( hWnd, GWLP_WNDPROC, (ULONG_PTR) AtlHost_wndproc ); return S_OK; @@ -924,9 +922,8 @@ static HRESULT IOCS_Attach( IOCS *This, HWND hWnd, IUnknown *pUnkControl ) /* su static HRESULT IOCS_Init( IOCS *This ) { RECT rect; - static const WCHAR AXWIN[] = {'A','X','W','I','N',0}; - IOleObject_SetHostNames( This->control, AXWIN, AXWIN ); + IOleObject_SetHostNames( This->control, L"AXWIN", L"AXWIN" ); GetClientRect( This->hWnd, &rect ); IOCS_OnSize( This, &rect ); @@ -1000,7 +997,6 @@ enum content static enum content get_content_type(LPCOLESTR name, CLSID *control_id) { - static const WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':',0}; WCHAR new_urlW[MAX_PATH]; DWORD size = MAX_PATH; @@ -1021,7 +1017,7 @@ static enum content get_content_type(LPCOLESTR name, CLSID *control_id) return IsURL; } - if (!wcsnicmp(name, mshtml_prefixW, 7)) + if (!wcsnicmp(name, L"mshtml:", 7)) { FIXME("mshtml prefix not implemented\n"); *control_id = CLSID_WebBrowser; @@ -1266,8 +1262,7 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) src += lstrlenW(src) + 1; /* title */ if ( GET_WORD(tmp) == '{' ) /* all this mess created because of this line */ { - static const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n', 0}; - PUT_BLOCK(AtlAxWin, ARRAY_SIZE(AtlAxWin)); + PUT_BLOCK(L"AtlAxWin", ARRAY_SIZE(L"AtlAxWin")); PUT_BLOCK(tmp, lstrlenW(tmp)+1); } else PUT_BLOCK(tmp, src-tmp); @@ -1373,7 +1368,7 @@ HRESULT WINAPI AtlAxGetHost(HWND hWnd, IUnknown **host) *host = NULL; - This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); + This = (IOCS*) GetPropW( hWnd, L"__WINE_ATL_IOCS" ); if ( !This ) { WARN("No container attached to %p\n", hWnd ); @@ -1395,7 +1390,7 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk) *pUnk = NULL; - This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); + This = (IOCS*) GetPropW( hWnd, L"__WINE_ATL_IOCS" ); if ( !This || !This->control ) { WARN("No control attached to %p\n", hWnd ); diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 586cce3201d..7c3c5976b22 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -32,27 +32,20 @@ static const struct { WCHAR name[22]; HKEY key; } root_keys[] = { - {{'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}, - HKEY_CLASSES_ROOT}, - {{'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}, - HKEY_CURRENT_USER}, - {{'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}, - HKEY_LOCAL_MACHINE}, - {{'H','K','E','Y','_','U','S','E','R','S',0}, - HKEY_USERS}, - {{'H','K','E','Y','_','P','E','R','F','O','R','M','A','N','C','E','_','D','A','T','A',0}, - HKEY_PERFORMANCE_DATA}, - {{'H','K','E','Y','_','D','Y','N','_','D','A','T','A',0}, - HKEY_DYN_DATA}, - {{'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}, - HKEY_CURRENT_CONFIG}, - {{'H','K','C','R',0}, HKEY_CLASSES_ROOT}, - {{'H','K','C','U',0}, HKEY_CURRENT_USER}, - {{'H','K','L','M',0}, HKEY_LOCAL_MACHINE}, - {{'H','K','U',0}, HKEY_USERS}, - {{'H','K','P','D',0}, HKEY_PERFORMANCE_DATA}, - {{'H','K','D','D',0}, HKEY_DYN_DATA}, - {{'H','K','C','C',0}, HKEY_CURRENT_CONFIG} + {L"HKEY_CLASSES_ROOT", HKEY_CLASSES_ROOT}, + {L"HKEY_CURRENT_USER", HKEY_CURRENT_USER}, + {L"HKEY_LOCAL_MACHINE", HKEY_LOCAL_MACHINE}, + {L"HKEY_USERS", HKEY_USERS}, + {L"HKEY_PERFORMANCE_DATA", HKEY_PERFORMANCE_DATA}, + {L"HKEY_DYN_DATA", HKEY_DYN_DATA}, + {L"HKEY_CURRENT_CONFIG", HKEY_CURRENT_CONFIG}, + {L"HKCR", HKEY_CLASSES_ROOT}, + {L"HKCU", HKEY_CURRENT_USER}, + {L"HKLM", HKEY_LOCAL_MACHINE}, + {L"HKU", HKEY_USERS}, + {L"HKPD", HKEY_PERFORMANCE_DATA}, + {L"HKDD", HKEY_DYN_DATA}, + {L"HKCC", HKEY_CURRENT_CONFIG} }; typedef struct rep_list_str { @@ -150,7 +143,6 @@ static HRESULT do_preprocess(const Registrar *This, LPCOLESTR data, strbuf *buf) { LPCOLESTR iter, iter2 = data; rep_list *rep_iter; - static const WCHAR wstr[] = {'%',0}; iter = wcschr(data, '%'); while(iter) { @@ -164,7 +156,7 @@ static HRESULT do_preprocess(const Registrar *This, LPCOLESTR data, strbuf *buf) return DISP_E_EXCEPTION; if(iter == iter2) { - strbuf_write(wstr, buf, 1); + strbuf_write(L"%", buf, 1); }else { for(rep_iter = This->rep; rep_iter; rep_iter = rep_iter->next) { if(rep_iter->key_len == iter-iter2 @@ -205,11 +197,6 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO DO_DELETE } key_type = NORMAL; - static const WCHAR wstrNoRemove[] = {'N','o','R','e','m','o','v','e',0}; - static const WCHAR wstrForceRemove[] = {'F','o','r','c','e','R','e','m','o','v','e',0}; - static const WCHAR wstrDelete[] = {'D','e','l','e','t','e',0}; - static const WCHAR wstrval[] = {'v','a','l',0}; - iter = *pstr; hres = get_word(&iter, buf); if(FAILED(hres)) @@ -218,13 +205,13 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO while(buf->str[1] || buf->str[0] != '}') { key_type = NORMAL; - if(!lstrcmpiW(buf->str, wstrNoRemove)) + if(!lstrcmpiW(buf->str, L"NoRemove")) key_type = NO_REMOVE; - else if(!lstrcmpiW(buf->str, wstrForceRemove)) + else if(!lstrcmpiW(buf->str, L"ForceRemove")) key_type = FORCE_REMOVE; - else if(!lstrcmpiW(buf->str, wstrval)) + else if(!lstrcmpiW(buf->str, L"val")) key_type = IS_VAL; - else if(!lstrcmpiW(buf->str, wstrDelete)) + else if(!lstrcmpiW(buf->str, L"Delete")) key_type = DO_DELETE; if(key_type != NORMAL) { @@ -716,9 +703,6 @@ HRESULT WINAPI AtlUpdateRegistryFromResourceD(HINSTANCE inst, LPCOLESTR res, IRegistrar *registrar; HRESULT hres; - static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; - static const WCHAR registryW[] = {'R','E','G','I','S','T','R','Y',0}; - if(!GetModuleFileNameW(inst, module_name, MAX_PATH)) { FIXME("hinst %p: did not get module name\n", inst); return E_FAIL; @@ -735,15 +719,15 @@ HRESULT WINAPI AtlUpdateRegistryFromResourceD(HINSTANCE inst, LPCOLESTR res, return hres; } - IRegistrar_AddReplacement(registrar, moduleW, module_name); + IRegistrar_AddReplacement(registrar, L"MODULE", module_name); for (iter = pMapEntries; iter && iter->szKey; iter++) IRegistrar_AddReplacement(registrar, iter->szKey, iter->szData); if(bRegister) - hres = IRegistrar_ResourceRegisterSz(registrar, module_name, res, registryW); + hres = IRegistrar_ResourceRegisterSz(registrar, module_name, res, L"REGISTRY"); else - hres = IRegistrar_ResourceUnregisterSz(registrar, module_name, res, registryW); + hres = IRegistrar_ResourceUnregisterSz(registrar, module_name, res, L"REGISTRY"); if(registrar != pReg) IRegistrar_Release(registrar); diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c index 6b944d1b285..94db3640ee3 100644 --- a/dlls/atl/tests/atl_ax.c +++ b/dlls/atl/tests/atl_ax.c @@ -115,7 +115,6 @@ static void test_ax_win(void) { BOOL ret; WNDCLASSEXW wcex; - static const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; static HMODULE hinstance = 0; ret = AtlAxWinInit(); @@ -124,7 +123,7 @@ static void test_ax_win(void) hinstance = GetModuleHandleA(NULL); memset(&wcex, 0, sizeof(wcex)); wcex.cbSize = sizeof(wcex); - ret = GetClassInfoExW(hinstance, AtlAxWin, &wcex); + ret = GetClassInfoExW(hinstance, L"AtlAxWin", &wcex); ok(ret, "AtlAxWin has not registered\n"); ok(wcex.style == CS_GLOBALCLASS, "wcex.style %08x\n", wcex.style); } -- 2.26.2

2 1

[PATCH] joy.cpl: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/joy.cpl/main.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3921f59cbb5..66ac58f7038 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(joycpl); DECLSPEC_HIDDEN HMODULE hcpl; -static const WCHAR button_class[] = {'B','u','t','t','o','n','\0'}; - /********************************************************************* * DllMain */ @@ -169,14 +167,11 @@ static void initialize_joysticks_list(HWND hwnd, struct JoystickData *data) */ static BOOL get_app_key(HKEY *defkey, HKEY *appkey) { - static const WCHAR reg_key[] = { 'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\', - 'D','i','r','e','c','t','I','n','p','u','t','\\', - 'J','o','y','s','t','i','c','k','s','\0' }; *appkey = 0; /* Registry key can be found in HKCU\Software\Wine\DirectInput */ - if (RegCreateKeyExW(HKEY_CURRENT_USER, reg_key, 0, NULL, 0, KEY_SET_VALUE | KEY_READ, NULL, defkey, NULL)) + if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\Wine\\DirectInput\\Joysticks", 0, NULL, 0, + KEY_SET_VALUE | KEY_READ, NULL, defkey, NULL)) *defkey = 0; return *defkey || *appkey; @@ -215,13 +210,12 @@ static DWORD set_config_key(HKEY defkey, HKEY appkey, const WCHAR *name, const W */ static void enable_joystick(WCHAR *joy_name, BOOL enable) { - static const WCHAR disabled_str[] = {'d','i','s','a','b','l','e','d','\0'}; HKEY hkey, appkey; get_app_key(&hkey, &appkey); if (!enable) - set_config_key(hkey, appkey, joy_name, disabled_str, lstrlenW(disabled_str)); + set_config_key(hkey, appkey, joy_name, L"disabled", lstrlenW(L"disabled")); else set_config_key(hkey, appkey, joy_name, NULL, 0); @@ -231,7 +225,6 @@ static void enable_joystick(WCHAR *joy_name, BOOL enable) static void initialize_disabled_joysticks_list(HWND hwnd) { - static const WCHAR disabled_str[] = {'d','i','s','a','b','l','e','d','\0'}; HKEY hkey, appkey; DWORD values = 0; LSTATUS status; @@ -250,7 +243,7 @@ static void initialize_disabled_joysticks_list(HWND hwnd) status = RegEnumValueW(hkey, i, buf_name, &name_len, NULL, NULL, (BYTE*) buf_data, &data_len); - if (status == ERROR_SUCCESS && !lstrcmpW(disabled_str, buf_data)) + if (status == ERROR_SUCCESS && !lstrcmpW(L"disabled", buf_data)) SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_ADDSTRING, 0, (LPARAM) buf_name); } @@ -492,7 +485,7 @@ static void draw_joystick_buttons(HWND hwnd, struct JoystickData* data) button_number_to_wchar(i + 1, button_label); - data->graphics.buttons[i] = CreateWindowW(button_class, button_label, WS_CHILD, + data->graphics.buttons[i] = CreateWindowW(L"Button", button_label, WS_CHILD, r.left, r.top, r.right - r.left, r.bottom - r.top, hwnd, NULL, NULL, hinst); @@ -504,8 +497,7 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data) { int i; HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE); - static const WCHAR axes_names[TEST_MAX_AXES][7] = { {'X',',','Y','\0'}, {'R','x',',','R','y','\0'}, - {'Z',',','R','z','\0'}, {'P','O','V','\0'} }; + static const WCHAR axes_names[TEST_MAX_AXES][7] = { L"X,Y", L"Rx,Ry", L"Z,Rz", L"POV"}; static const DWORD axes_idc[TEST_MAX_AXES] = { IDC_TESTGROUPXY, IDC_TESTGROUPRXRY, IDC_TESTGROUPZRZ, IDC_TESTGROUPPOV }; @@ -521,7 +513,7 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data) r.bottom = r.top + TEST_AXIS_SIZE_Y; MapDialogRect(hwnd, &r); - data->graphics.axes[i] = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE, + data->graphics.axes[i] = CreateWindowW(L"Button", NULL, WS_CHILD | WS_VISIBLE, r.left, r.top, r.right - r.left, r.bottom - r.top, hwnd, NULL, NULL, hinst); } @@ -617,7 +609,7 @@ static void draw_ff_axis(HWND hwnd, struct JoystickData *data) MapDialogRect(hwnd, &r); /* Draw direction axis */ - data->graphics.ff_axis = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE, + data->graphics.ff_axis = CreateWindowW(L"Button", NULL, WS_CHILD | WS_VISIBLE, r.left, r.top, r.right - r.left, r.bottom - r.top, hwnd, NULL, NULL, hinst); } -- 2.26.2

1 0

[PATCH] dinput/tests: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/tests/joystick.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index f082c612b08..8a3e5e3022c 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -405,17 +405,13 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) ok(SUCCEEDED(hr), "IDirectInput_GetProperty() for DIPROP_GUIDANDPATH failed: %08x\n", hr); { - static const WCHAR formatW[] = {'\\','\\','?','\\','%','*','[','^','#',']','#','v','i','d','_', - '%','0','4','x','&','p','i','d','_','%','0','4','x',0}; - static const WCHAR miW[] = {'m','i','_',0}; - static const WCHAR igW[] = {'i','g','_',0}; int vid, pid; _wcslwr(dpg.wszPath); - count = swscanf(dpg.wszPath, formatW, &vid, &pid); + count = swscanf(dpg.wszPath, L"\\\\?\\%*[^#]#vid_%04x&pid_%04x", &vid, &pid); ok(count == 2, "DIPROP_GUIDANDPATH path has wrong format. Expected count: 2 Got: %i Path: %s\n", count, wine_dbgstr_w(dpg.wszPath)); - ok(wcsstr(dpg.wszPath, miW) != 0 || wcsstr(dpg.wszPath, igW) != 0, + ok(wcsstr(dpg.wszPath, L"mi_") != 0 || wcsstr(dpg.wszPath, L"ig_") != 0, "DIPROP_GUIDANDPATH path should contain either 'ig_' or 'mi_' substring. Path: %s\n", wine_dbgstr_w(dpg.wszPath)); } -- 2.26.2

1 0

[PATCH] dinput8/tests: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput8/tests/device.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 80a7fe26c3b..2fc04358cc1 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -627,18 +627,17 @@ static void test_mouse_keyboard(void) if (raw_devices[0].hwndTarget != NULL) { - WCHAR di_hwnd_class[] = {'D','I','E','m','W','i','n',0}; WCHAR str[16]; int i; di_hwnd = raw_devices[0].hwndTarget; i = GetClassNameW(di_hwnd, str, ARRAY_SIZE(str)); - ok(i == lstrlenW(di_hwnd_class), "GetClassName returned incorrect length\n"); - ok(!lstrcmpW(di_hwnd_class, str), "GetClassName returned incorrect name for this window's class\n"); + ok(i == lstrlenW(L"DIEmWin"), "GetClassName returned incorrect length\n"); + ok(!lstrcmpW(L"DIEmWin", str), "GetClassName returned incorrect name for this window's class\n"); i = GetWindowTextW(di_hwnd, str, ARRAY_SIZE(str)); - ok(i == lstrlenW(di_hwnd_class), "GetClassName returned incorrect length\n"); - ok(!lstrcmpW(di_hwnd_class, str), "GetClassName returned incorrect name for this window's class\n"); + ok(i == lstrlenW(L"DIEmWin"), "GetClassName returned incorrect length\n"); + ok(!lstrcmpW(L"DIEmWin", str), "GetClassName returned incorrect name for this window's class\n"); } hr = IDirectInputDevice8_Acquire(di_mouse); -- 2.26.2

1 0

[PATCH 2/2] advpack: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advpack/advpack.c | 47 +++++++---------------------- dlls/advpack/files.c | 36 +++++------------------ dlls/advpack/install.c | 60 ++++++++++---------------------------- dlls/advpack/reg.c | 29 +++++++----------- dlls/advpack/tests/files.c | 7 +---- 5 files changed, 46 insertions(+), 133 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index e3d4d50837b..25751af64bc 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -41,13 +41,7 @@ typedef HRESULT (WINAPI *DLLREGISTER) (void); #define PREFIX_LEN 5 /* registry path of the Installed Components key for per-user stubs */ -static const WCHAR setup_key[] = { - 'S','O','F','T','W','A','R','E','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'A','c','t','i','v','e',' ','S','e','t','u','p','\\', - 'I','n','s','t','a','l','l','e','d',' ', - 'C','o','m','p','o','n','e','n','t','s',0 -}; +static const WCHAR setup_key[] = L"SOFTWARE\\Microsoft\\Active Setup\\Installed Components"; /* Strip single quotes from a token - note size includes NULL */ static void strip_quotes(WCHAR *buffer, DWORD *size) @@ -73,9 +67,6 @@ static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dw HKEY root, subkey = 0; DWORD size; - static const WCHAR hklm[] = {'H','K','L','M',0}; - static const WCHAR hkcu[] = {'H','K','C','U',0}; - /* load the destination parameters */ SetupFindFirstLineW(hInf, pszSection, NULL, &context); SetupGetStringFieldW(&context, 1, prefix, PREFIX_LEN + 2, &size); @@ -85,9 +76,9 @@ static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dw SetupGetStringFieldW(&context, 3, value, MAX_PATH + 2, &size); strip_quotes(value, &size); - if (!lstrcmpW(prefix, hklm)) + if (!lstrcmpW(prefix, L"HKLM")) root = HKEY_LOCAL_MACHINE; - else if (!lstrcmpW(prefix, hkcu)) + else if (!lstrcmpW(prefix, L"HKCU")) root = HKEY_CURRENT_USER; else root = NULL; @@ -115,13 +106,7 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DWORD size; int ldid; - static const WCHAR source_dir[] = {'S','o','u','r','c','e','D','i','r',0}; - - static const WCHAR custDestW[] = { - 'C','u','s','t','o','m','D','e','s','t','i','n','a','t','i','o','n',0 - }; - - if (!SetupGetLineTextW(NULL, hInf, pszInstallSection, custDestW, + if (!SetupGetLineTextW(NULL, hInf, pszInstallSection, L"CustomDestination", field, MAX_FIELD_LENGTH, &size)) return; @@ -165,7 +150,7 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) } /* set dest to pszWorkingDir if key is SourceDir */ - if (pszWorkingDir && !lstrcmpiW(value, source_dir)) + if (pszWorkingDir && !lstrcmpiW(value, L"SourceDir")) lstrcpynW(dest, pszWorkingDir, MAX_PATH); else get_dest_dir(hInf, value, dest, MAX_PATH); @@ -559,12 +544,6 @@ HRESULT WINAPI SetPerUserSecValuesW(PERUSERSECTIONW* pPerUser) { HKEY setup, guid; - static const WCHAR stub_path[] = {'S','t','u','b','P','a','t','h',0}; - static const WCHAR version[] = {'V','e','r','s','i','o','n',0}; - static const WCHAR locale[] = {'L','o','c','a','l','e',0}; - static const WCHAR compid[] = {'C','o','m','p','o','n','e','n','t','I','D',0}; - static const WCHAR isinstalled[] = {'I','s','I','n','s','t','a','l','l','e','d',0}; - TRACE("(%p)\n", pPerUser); if (!pPerUser || !*pPerUser->szGUID) @@ -585,25 +564,25 @@ HRESULT WINAPI SetPerUserSecValuesW(PERUSERSECTIONW* pPerUser) if (*pPerUser->szStub) { - RegSetValueExW(guid, stub_path, 0, REG_SZ, (LPBYTE)pPerUser->szStub, + RegSetValueExW(guid, L"StubPath", 0, REG_SZ, (BYTE *)pPerUser->szStub, (lstrlenW(pPerUser->szStub) + 1) * sizeof(WCHAR)); } if (*pPerUser->szVersion) { - RegSetValueExW(guid, version, 0, REG_SZ, (LPBYTE)pPerUser->szVersion, + RegSetValueExW(guid, L"Version", 0, REG_SZ, (BYTE *)pPerUser->szVersion, (lstrlenW(pPerUser->szVersion) + 1) * sizeof(WCHAR)); } if (*pPerUser->szLocale) { - RegSetValueExW(guid, locale, 0, REG_SZ, (LPBYTE)pPerUser->szLocale, + RegSetValueExW(guid, L"Locale", 0, REG_SZ, (BYTE *)pPerUser->szLocale, (lstrlenW(pPerUser->szLocale) + 1) * sizeof(WCHAR)); } if (*pPerUser->szCompID) { - RegSetValueExW(guid, compid, 0, REG_SZ, (LPBYTE)pPerUser->szCompID, + RegSetValueExW(guid, L"ComponentID", 0, REG_SZ, (BYTE *)pPerUser->szCompID, (lstrlenW(pPerUser->szCompID) + 1) * sizeof(WCHAR)); } @@ -613,7 +592,7 @@ HRESULT WINAPI SetPerUserSecValuesW(PERUSERSECTIONW* pPerUser) (lstrlenW(pPerUser->szDispName) + 1) * sizeof(WCHAR)); } - RegSetValueExW(guid, isinstalled, 0, REG_DWORD, + RegSetValueExW(guid, L"IsInstalled", 0, REG_DWORD, (LPBYTE)&pPerUser->dwIsInstalled, sizeof(DWORD)); RegCloseKey(guid); @@ -911,10 +890,6 @@ HRESULT WINAPI UserInstStubWrapperW(HWND hWnd, HINSTANCE hInstance, HRESULT hr = S_OK; BOOL res; - static const WCHAR real_stub_path[] = { - 'R','e','a','l','S','t','u','b','P','a','t','h',0 - }; - TRACE("(%p, %p, %s, %i)\n", hWnd, hInstance, debugstr_w(pszParms), nShow); if (!pszParms || !*pszParms) @@ -931,7 +906,7 @@ HRESULT WINAPI UserInstStubWrapperW(HWND hWnd, HINSTANCE hInstance, return E_FAIL; } - res = RegQueryValueExW(guid, real_stub_path, NULL, NULL, (LPBYTE)stub, &size); + res = RegQueryValueExW(guid, L"RealStubPath", NULL, NULL, (BYTE *)stub, &size); if (res || !*stub) goto done; diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 3e4cb366007..58ff76e0505 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -120,14 +120,6 @@ HRESULT WINAPI AddDelBackupEntryW(LPCWSTR lpcszFileList, LPCWSTR lpcszBackupDir, WCHAR szIniPath[MAX_PATH]; LPCWSTR szString = NULL; - static const WCHAR szBackupEntry[] = { - '-','1',',','0',',','0',',','0',',','0',',','0',',','-','1',0 - }; - - static const WCHAR backslash[] = {'\\',0}; - static const WCHAR ini[] = {'.','i','n','i',0}; - static const WCHAR backup[] = {'b','a','c','k','u','p',0}; - TRACE("(%s, %s, %s, %d)\n", debugstr_w(lpcszFileList), debugstr_w(lpcszBackupDir), debugstr_w(lpcszBaseName), dwFlags); @@ -139,21 +131,21 @@ HRESULT WINAPI AddDelBackupEntryW(LPCWSTR lpcszFileList, LPCWSTR lpcszBackupDir, else GetWindowsDirectoryW(szIniPath, MAX_PATH); - lstrcatW(szIniPath, backslash); + lstrcatW(szIniPath, L"\\"); lstrcatW(szIniPath, lpcszBaseName); - lstrcatW(szIniPath, ini); + lstrcatW(szIniPath, L".ini"); SetFileAttributesW(szIniPath, FILE_ATTRIBUTE_NORMAL); if (dwFlags & AADBE_ADD_ENTRY) - szString = szBackupEntry; + szString = L"-1,0,0,0,0,0,-1"; else if (dwFlags & AADBE_DEL_ENTRY) szString = NULL; /* add or delete the INI entries */ while (*lpcszFileList) { - WritePrivateProfileStringW(backup, lpcszFileList, szString, szIniPath); + WritePrivateProfileStringW(L"backup", lpcszFileList, szString, szIniPath); lpcszFileList += lstrlenW(lpcszFileList) + 1; } @@ -332,10 +324,6 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) DWORD fattrs = GetFileAttributesW(fname); HRESULT ret = E_FAIL; - static const WCHAR asterisk[] = {'*',0}; - static const WCHAR dot[] = {'.',0}; - static const WCHAR dotdot[] = {'.','.',0}; - if (fattrs & FILE_ATTRIBUTE_DIRECTORY) { HANDLE hFindFile; @@ -345,7 +333,7 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) /* Generate a path with wildcard suitable for iterating */ if (fname_len && fname[fname_len-1] != '\\') fname[fname_len++] = '\\'; - lstrcpyW(fname + fname_len, asterisk); + lstrcpyW(fname + fname_len, L"*"); if ((hFindFile = FindFirstFileW(fname, &w32fd)) != INVALID_HANDLE_VALUE) { @@ -353,8 +341,7 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) for (done = FALSE; !done; done = !FindNextFileW(hFindFile, &w32fd)) { TRACE("%s\n", debugstr_w(w32fd.cFileName)); - if (lstrcmpW(dot, w32fd.cFileName) != 0 && - lstrcmpW(dotdot, w32fd.cFileName) != 0) + if (lstrcmpW(L".", w32fd.cFileName) != 0 && lstrcmpW(L"..", w32fd.cFileName) != 0) { lstrcpyW(fname + fname_len, w32fd.cFileName); if (DELNODE_recurse_dirtree(fname, flags) != S_OK) @@ -1063,12 +1050,6 @@ HRESULT WINAPI GetVersionFromFileExW(LPCWSTR lpszFilename, LPDWORD pdwMSVer, BOOL bFileCopied = FALSE; UINT uValueLen; - static const WCHAR backslash[] = {'\\',0}; - static const WCHAR translation[] = { - '\\','V','a','r','F','i','l','e','I','n','f','o', - '\\','T','r','a','n','s','l','a','t','i','o','n',0 - }; - TRACE("(%s, %p, %p, %d)\n", debugstr_w(lpszFilename), pdwMSVer, pdwLSVer, bVersion); @@ -1106,8 +1087,7 @@ HRESULT WINAPI GetVersionFromFileExW(LPCWSTR lpszFilename, LPDWORD pdwMSVer, if (bVersion) { - if (!VerQueryValueW(pVersionInfo, backslash, - (LPVOID *)&pFixedVersionInfo, &uValueLen)) + if (!VerQueryValueW(pVersionInfo, L"\\", (void **)&pFixedVersionInfo, &uValueLen)) goto done; if (!uValueLen) @@ -1118,7 +1098,7 @@ HRESULT WINAPI GetVersionFromFileExW(LPCWSTR lpszFilename, LPDWORD pdwMSVer, } else { - if (!VerQueryValueW(pVersionInfo, translation, + if (!VerQueryValueW(pVersionInfo, L"\\VarFileInfo\\Translation", (LPVOID *)&pLangAndCodePage, &uValueLen)) goto done; diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 24e2c4579a9..a2ccbd55099 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -59,20 +59,6 @@ typedef struct _ADVInfo typedef HRESULT (*iterate_fields_func)(HINF hinf, PCWSTR field, const void *arg); -/* Advanced INF commands */ -static const WCHAR CheckAdminRights[] = { - 'C','h','e','c','k','A','d','m','i','n','R','i','g','h','t','s',0 -}; -static const WCHAR DelDirs[] = {'D','e','l','D','i','r','s',0}; -static const WCHAR PerUserInstall[] = {'P','e','r','U','s','e','r','I','n','s','t','a','l','l',0}; -static const WCHAR RegisterOCXs[] = {'R','e','g','i','s','t','e','r','O','C','X','s',0}; -static const WCHAR RunPreSetupCommands[] = { - 'R','u','n','P','r','e','S','e','t','u','p','C','o','m','m','a','n','d','s',0 -}; -static const WCHAR RunPostSetupCommands[] = { - 'R','u','n','P','o','s','t','S','e','t','u','p','C','o','m','m','a','n','d','s',0 -}; - /* Advanced INF callbacks */ static HRESULT del_dirs_callback(HINF hinf, PCWSTR field, const void *arg) { @@ -103,33 +89,25 @@ static HRESULT per_user_install_callback(HINF hinf, PCWSTR field, const void *ar INFCONTEXT context; DWORD size; - static const WCHAR disp_name[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; - static const WCHAR version[] = {'V','e','r','s','i','o','n',0}; - static const WCHAR is_installed[] = {'I','s','I','n','s','t','a','l','l','e','d',0}; - static const WCHAR comp_id[] = {'C','o','m','p','o','n','e','n','t','I','D',0}; - static const WCHAR guid[] = {'G','U','I','D',0}; - static const WCHAR locale[] = {'L','o','c','a','l','e',0}; - static const WCHAR stub_path[] = {'S','t','u','b','P','a','t','h',0}; - per_user.bRollback = FALSE; per_user.dwIsInstalled = 0; - SetupGetLineTextW(NULL, hinf, field, disp_name, per_user.szDispName, ARRAY_SIZE(per_user.szDispName), &size); + SetupGetLineTextW(NULL, hinf, field, L"DisplayName", per_user.szDispName, ARRAY_SIZE(per_user.szDispName), &size); - SetupGetLineTextW(NULL, hinf, field, version, per_user.szVersion, ARRAY_SIZE(per_user.szVersion), &size); + SetupGetLineTextW(NULL, hinf, field, L"Version", per_user.szVersion, ARRAY_SIZE(per_user.szVersion), &size); - if (SetupFindFirstLineW(hinf, field, is_installed, &context)) + if (SetupFindFirstLineW(hinf, field, L"IsInstalled", &context)) { SetupGetIntField(&context, 1, (PINT)&per_user.dwIsInstalled); } - SetupGetLineTextW(NULL, hinf, field, comp_id, per_user.szCompID, ARRAY_SIZE(per_user.szCompID), &size); + SetupGetLineTextW(NULL, hinf, field, L"ComponentID", per_user.szCompID, ARRAY_SIZE(per_user.szCompID), &size); - SetupGetLineTextW(NULL, hinf, field, guid, per_user.szGUID, ARRAY_SIZE(per_user.szGUID), &size); + SetupGetLineTextW(NULL, hinf, field, L"GUID", per_user.szGUID, ARRAY_SIZE(per_user.szGUID), &size); - SetupGetLineTextW(NULL, hinf, field, locale, per_user.szLocale, ARRAY_SIZE(per_user.szLocale), &size); + SetupGetLineTextW(NULL, hinf, field, L"Locale", per_user.szLocale, ARRAY_SIZE(per_user.szLocale), &size); - SetupGetLineTextW(NULL, hinf, field, stub_path, per_user.szStub, ARRAY_SIZE(per_user.szStub), &size); + SetupGetLineTextW(NULL, hinf, field, L"StubPath", per_user.szStub, ARRAY_SIZE(per_user.szStub), &size); return SetPerUserSecValuesW(&per_user); } @@ -299,8 +277,7 @@ static HRESULT check_admin_rights(const ADVInfo *info) INFCONTEXT context; HRESULT hr = S_OK; - if (!SetupFindFirstLineW(info->hinf, info->install_sec, - CheckAdminRights, &context)) + if (!SetupFindFirstLineW(info->hinf, info->install_sec, L"CheckAdminRights", &context)) return S_OK; if (!SetupGetIntField(&context, 1, &check)) @@ -356,30 +333,29 @@ static HRESULT adv_install(ADVInfo *info) if (hr != S_OK) return hr; - hr = iterate_section_fields(info->hinf, info->install_sec, RunPreSetupCommands, + hr = iterate_section_fields(info->hinf, info->install_sec, L"RunPreSetupCommands", run_setup_commands_callback, info); if (hr != S_OK) return hr; OleInitialize(NULL); hr = iterate_section_fields(info->hinf, info->install_sec, - RegisterOCXs, register_ocxs_callback, NULL); + L"RegisterOCXs", register_ocxs_callback, NULL); OleUninitialize(); if (hr != S_OK) return hr; hr = iterate_section_fields(info->hinf, info->install_sec, - PerUserInstall, per_user_install_callback, info); + L"PerUserInstall", per_user_install_callback, info); if (hr != S_OK) return hr; - hr = iterate_section_fields(info->hinf, info->install_sec, RunPostSetupCommands, + hr = iterate_section_fields(info->hinf, info->install_sec, L"RunPostSetupCommands", run_setup_commands_callback, info); if (hr != S_OK) return hr; - hr = iterate_section_fields(info->hinf, info->install_sec, - DelDirs, del_dirs_callback, info); + hr = iterate_section_fields(info->hinf, info->install_sec, L"DelDirs", del_dirs_callback, info); if (hr != S_OK) return hr; @@ -393,9 +369,6 @@ static HRESULT get_working_dir(ADVInfo *info, LPCWSTR inf_filename, LPCWSTR work LPCWSTR ptr; DWORD len; - static const WCHAR backslash[] = {'\\',0}; - static const WCHAR inf_dir[] = {'\\','I','N','F',0}; - if ((ptr = wcsrchr(inf_filename, '\\'))) { len = ptr - inf_filename + 1; @@ -409,7 +382,7 @@ static HRESULT get_working_dir(ADVInfo *info, LPCWSTR inf_filename, LPCWSTR work else { GetCurrentDirectoryW(MAX_PATH, path); - lstrcatW(path, backslash); + lstrcatW(path, L"\\"); lstrcatW(path, inf_filename); /* check if the INF file is in the current directory */ @@ -421,7 +394,7 @@ static HRESULT get_working_dir(ADVInfo *info, LPCWSTR inf_filename, LPCWSTR work { /* default to the windows\inf directory if all else fails */ GetWindowsDirectoryW(path, MAX_PATH); - lstrcatW(path, inf_dir); + lstrcatW(path, L"\\INF"); } len = lstrlenW(path) + 1; @@ -445,7 +418,6 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, HRESULT hr; LPCWSTR ptr, path; - static const WCHAR backslash[] = {'\\',0}; if (!(ptr = wcsrchr(inf_filename, '\\'))) ptr = inf_filename; @@ -485,7 +457,7 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, return E_OUTOFMEMORY; lstrcpyW(info->inf_path, info->working_dir); - lstrcatW(info->inf_path, backslash); + lstrcatW(info->inf_path, L"\\"); lstrcatW(info->inf_path, info->inf_filename); /* RunSetupCommand opens unmodified filename parameter */ diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 472bbcd9694..555743d656c 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -31,23 +31,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); -static const WCHAR REGINST[] = {'R','E','G','I','N','S','T',0}; -static const WCHAR Strings[] = {'S','t','r','i','n','g','s',0}; -static const WCHAR MOD_PATH[] = {'_','M','O','D','_','P','A','T','H',0}; -static const WCHAR SYS_MOD_PATH[] = {'_','S','Y','S','_','M','O','D','_','P','A','T','H',0}; -static const WCHAR SystemRoot[] = {'S','y','s','t','e','m','R','o','o','t',0}; -static const WCHAR escaped_SystemRoot[] = {'%','S','y','s','t','e','m','R','o','o','t','%',0}; -static const WCHAR quote[] = {'\"',0}; - static BOOL get_temp_ini_path(LPWSTR name) { - static const WCHAR prefix[] = {'a','v','p',0}; WCHAR tmp_dir[MAX_PATH]; if(!GetTempPathW(ARRAY_SIZE(tmp_dir), tmp_dir)) return FALSE; - if(!GetTempFileNameW(tmp_dir, prefix, 0, name)) + if (!GetTempFileNameW(tmp_dir, L"avp", 0, name)) return FALSE; return TRUE; } @@ -65,7 +56,7 @@ static BOOL create_tmp_ini_file(HMODULE hm, WCHAR *ini_file) goto error; } - if(!(hrsrc = FindResourceW(hm, REGINST, REGINST))) { + if (!(hrsrc = FindResourceW(hm, L"REGINST", L"REGINST"))) { ERR("Can't find REGINST resource\n"); goto error; } @@ -180,16 +171,16 @@ static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path) if (!GetModuleFileNameW(hm, mod_path + 1, ARRAY_SIZE(mod_path) - 2)) return E_FAIL; - lstrcatW(mod_path, quote); - WritePrivateProfileStringW(Strings, MOD_PATH, mod_path, ini_path); + lstrcatW(mod_path, L"\""); + WritePrivateProfileStringW(L"Strings", L"_MOD_PATH", mod_path, ini_path); *sys_root = '\0'; - GetEnvironmentVariableW(SystemRoot, sys_root, ARRAY_SIZE(sys_root)); + GetEnvironmentVariableW(L"SystemRoot", sys_root, ARRAY_SIZE(sys_root)); if(!wcsnicmp(sys_root, mod_path + 1, lstrlenW(sys_root))) { *sys_mod_path = '\"'; - lstrcpyW(sys_mod_path + 1, escaped_SystemRoot); + lstrcpyW(sys_mod_path + 1, L"%SystemRoot%"); lstrcatW(sys_mod_path, mod_path + 1 + lstrlenW(sys_root)); } else @@ -198,7 +189,7 @@ static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path) lstrcpyW(sys_mod_path, mod_path); } - WritePrivateProfileStringW(Strings, SYS_MOD_PATH, sys_mod_path, ini_path); + WritePrivateProfileStringW(L"Strings", L"_SYS_MOD_PATH", sys_mod_path, ini_path); return S_OK; } @@ -242,9 +233,9 @@ HRESULT WINAPI RegInstallW(HMODULE hm, LPCWSTR pszSection, const STRTABLEW* pstT tmp_value[0] = '\"'; lstrcpyW(tmp_value + 1, pstTable->pse[i].pszValue); - lstrcatW(tmp_value, quote); - - WritePrivateProfileStringW(Strings, pstTable->pse[i].pszName, tmp_value, tmp_ini_path); + lstrcatW(tmp_value, L"\""); + + WritePrivateProfileStringW(L"Strings", pstTable->pse[i].pszName, tmp_value, tmp_ini_path); } } diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 135a09f97d6..488b7ab6136 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -472,12 +472,7 @@ static void test_ExtractFiles(void) ok(!RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to not exist\n"); if(pExtractFilesW) { - static const WCHAR extract_cabW[] = {'e','x','t','r','a','c','t','.','c','a','b',0}; - static const WCHAR destW[] = {'d','e','s','t',0}; - static const WCHAR file_listW[] = - {'a','.','t','x','t',':','t','e','s','t','d','i','r','\\','c','.','t','x','t',0}; - - hr = pExtractFilesW(extract_cabW, destW, 0, file_listW, NULL, 0); + hr = pExtractFilesW(L"extract.cab", L"dest", 0, L"a.txt:testdir\\c.txt", NULL, 0); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); -- 2.26.2

1 0

[PATCH 1/2] advpack: Don't use sizeof to calculate the length of a WCHAR string
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advpack/install.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index d82de9c3617..24e2c4579a9 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -446,10 +446,6 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, LPCWSTR ptr, path; static const WCHAR backslash[] = {'\\',0}; - static const WCHAR default_install[] = { - 'D','e','f','a','u','l','t','I','n','s','t','a','l','l',0 - }; - if (!(ptr = wcsrchr(inf_filename, '\\'))) ptr = inf_filename; @@ -464,16 +460,16 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, /* FIXME: determine the proper platform to install (NTx86, etc) */ if (!install_sec || !*install_sec) { - len = sizeof(default_install) - 1; - ptr = default_install; + len = ARRAY_SIZE(L"DefaultInstall"); + ptr = L"DefaultInstall"; } else { - len = lstrlenW(install_sec); + len = lstrlenW(install_sec) + 1; ptr = install_sec; } - info->install_sec = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + info->install_sec = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!info->install_sec) return E_OUTOFMEMORY; -- 2.26.2

1 0

[PATCH] winemine: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winemine/main.c | 53 +++++++++++++++------------------------- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 255d21714fd..37ce1927047 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -33,19 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winemine); static const DWORD wnd_style = WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX; -static const WCHAR registry_key[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','M','i','n','e',0}; - -static const WCHAR xposW[] = {'X','p','o','s',0}; -static const WCHAR yposW[] = {'Y','p','o','s',0}; -static const WCHAR heightW[] = {'H','e','i','g','h','t',0}; -static const WCHAR widthW[] = {'W','i','d','t','h',0}; -static const WCHAR minesW[] = {'M','i','n','e','s',0}; -static const WCHAR difficultyW[] = {'D','i','f','f','i','c','u','l','t','y',0}; -static const WCHAR markW[] = {'M','a','r','k',0}; -static const WCHAR nameW[] = {'N','a','m','e','%','u',0}; -static const WCHAR timeW[] = {'T','i','m','e','%','u',0}; void CheckLevel( BOARD *p_board ) { @@ -77,38 +64,38 @@ static void LoadBoard( BOARD *p_board ) WCHAR key_name[8]; unsigned i; - RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hkey ); + RegOpenKeyExW( HKEY_CURRENT_USER, L"Software\\Microsoft\\WinMine", 0, KEY_QUERY_VALUE, &hkey ); size = sizeof( p_board->pos.x ); - if( RegQueryValueExW( hkey, xposW, NULL, &type, (BYTE*) &p_board->pos.x, &size ) ) + if( RegQueryValueExW( hkey, L"Xpos", NULL, &type, (BYTE*) &p_board->pos.x, &size ) ) p_board->pos.x = 0; size = sizeof( p_board->pos.y ); - if( RegQueryValueExW( hkey, yposW, NULL, &type, (BYTE*) &p_board->pos.y, &size ) ) + if( RegQueryValueExW( hkey, L"Ypos", NULL, &type, (BYTE*) &p_board->pos.y, &size ) ) p_board->pos.y = 0; size = sizeof( p_board->rows ); - if( RegQueryValueExW( hkey, heightW, NULL, &type, (BYTE*) &p_board->rows, &size ) ) + if( RegQueryValueExW( hkey, L"Height", NULL, &type, (BYTE*) &p_board->rows, &size ) ) p_board->rows = BEGINNER_ROWS; size = sizeof( p_board->cols ); - if( RegQueryValueExW( hkey, widthW, NULL, &type, (BYTE*) &p_board->cols, &size ) ) + if( RegQueryValueExW( hkey, L"Width", NULL, &type, (BYTE*) &p_board->cols, &size ) ) p_board->cols = BEGINNER_COLS; size = sizeof( p_board->mines ); - if( RegQueryValueExW( hkey, minesW, NULL, &type, (BYTE*) &p_board->mines, &size ) ) + if( RegQueryValueExW( hkey, L"Mines", NULL, &type, (BYTE*) &p_board->mines, &size ) ) p_board->mines = BEGINNER_MINES; size = sizeof( p_board->difficulty ); - if( RegQueryValueExW( hkey, difficultyW, NULL, &type, (BYTE*) &p_board->difficulty, &size ) ) + if( RegQueryValueExW( hkey, L"Difficulty", NULL, &type, (BYTE*) &p_board->difficulty, &size ) ) p_board->difficulty = BEGINNER; size = sizeof( p_board->IsMarkQ ); - if( RegQueryValueExW( hkey, markW, NULL, &type, (BYTE*) &p_board->IsMarkQ, &size ) ) + if( RegQueryValueExW( hkey, L"Mark", NULL, &type, (BYTE*) &p_board->IsMarkQ, &size ) ) p_board->IsMarkQ = TRUE; for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, nameW, i+1 ); + wsprintfW( key_name, L"Name%u", i+1 ); size = sizeof( data ); if( RegQueryValueExW( hkey, key_name, NULL, &type, (LPBYTE) data, &size ) == ERROR_SUCCESS ) @@ -118,7 +105,7 @@ static void LoadBoard( BOARD *p_board ) } for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, timeW, i+1 ); + wsprintfW( key_name, L"Time%u", i+1 ); size = sizeof( p_board->best_time[i] ); if( RegQueryValueExW( hkey, key_name, NULL, &type, (BYTE*) &p_board->best_time[i], &size ) ) p_board->best_time[i] = 999; @@ -163,28 +150,28 @@ void SaveBoard( BOARD *p_board ) WCHAR data[MAX_PLAYER_NAME_SIZE+1]; WCHAR key_name[8]; - if( RegCreateKeyExW( HKEY_CURRENT_USER, registry_key, + if( RegCreateKeyExW( HKEY_CURRENT_USER, L"Software\\Microsoft\\WinMine", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL ) != ERROR_SUCCESS) return; - RegSetValueExW( hkey, xposW, 0, REG_DWORD, (LPBYTE) &p_board->pos.x, sizeof(p_board->pos.x) ); - RegSetValueExW( hkey, yposW, 0, REG_DWORD, (LPBYTE) &p_board->pos.y, sizeof(p_board->pos.y) ); - RegSetValueExW( hkey, difficultyW, 0, REG_DWORD, (LPBYTE) &p_board->difficulty, sizeof(p_board->difficulty) ); - RegSetValueExW( hkey, heightW, 0, REG_DWORD, (LPBYTE) &p_board->rows, sizeof(p_board->rows) ); - RegSetValueExW( hkey, widthW, 0, REG_DWORD, (LPBYTE) &p_board->cols, sizeof(p_board->cols) ); - RegSetValueExW( hkey, minesW, 0, REG_DWORD, (LPBYTE) &p_board->mines, sizeof(p_board->mines) ); - RegSetValueExW( hkey, markW, 0, REG_DWORD, (LPBYTE) &p_board->IsMarkQ, sizeof(p_board->IsMarkQ) ); + RegSetValueExW( hkey, L"Xpos", 0, REG_DWORD, (BYTE*) &p_board->pos.x, sizeof(p_board->pos.x) ); + RegSetValueExW( hkey, L"Ypos", 0, REG_DWORD, (BYTE*) &p_board->pos.y, sizeof(p_board->pos.y) ); + RegSetValueExW( hkey, L"Difficulty", 0, REG_DWORD, (BYTE*) &p_board->difficulty, sizeof(p_board->difficulty) ); + RegSetValueExW( hkey, L"Height", 0, REG_DWORD, (BYTE*) &p_board->rows, sizeof(p_board->rows) ); + RegSetValueExW( hkey, L"Width", 0, REG_DWORD, (BYTE*) &p_board->cols, sizeof(p_board->cols) ); + RegSetValueExW( hkey, L"Mines", 0, REG_DWORD, (BYTE*) &p_board->mines, sizeof(p_board->mines) ); + RegSetValueExW( hkey, L"Mark", 0, REG_DWORD, (BYTE*) &p_board->IsMarkQ, sizeof(p_board->IsMarkQ) ); for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, nameW, i+1 ); + wsprintfW( key_name, L"Name%u", i+1 ); lstrcpynW( data, p_board->best_name[i], ARRAY_SIZE(data)); RegSetValueExW( hkey, key_name, 0, REG_SZ, (LPBYTE) data, (lstrlenW(data)+1) * sizeof(WCHAR) ); } for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, timeW, i+1 ); + wsprintfW( key_name, L"Time%u", i+1 ); RegSetValueExW( hkey, key_name, 0, REG_DWORD, (LPBYTE) &p_board->best_time[i], sizeof(p_board->best_time[i]) ); } RegCloseKey( hkey ); -- 2.26.2

1 0

[PATCH] view: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/view/view.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index 2664eeb9b1f..ad29734828b 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -24,7 +24,7 @@ static HINSTANCE hInst; static HWND hMainWnd; -static WCHAR szAppName[5] = {'V','i','e','w',0}; +static const WCHAR szAppName[] = L"View"; static WCHAR szTitle[MAX_PATH]; static WCHAR szFileTitle[MAX_PATH]; @@ -52,14 +52,13 @@ typedef struct static BOOL FileOpen(HWND hWnd, WCHAR *fn, int fnsz) { WCHAR filter[120], metafileFilter[100]; - static const WCHAR filterW[] = {'%','s','%','c','*','.','w','m','f',';','*','.','e','m','f','%','c',0}; OPENFILENAMEW ofn = { sizeof(OPENFILENAMEW), 0, 0, NULL, NULL, 0, 0, NULL, fnsz, NULL, 0, NULL, NULL, OFN_SHOWHELP, 0, 0, NULL, 0, NULL }; LoadStringW( hInst, IDS_OPEN_META_STRING, metafileFilter, ARRAY_SIZE(metafileFilter) ); - swprintf( filter, ARRAY_SIZE(filter), filterW, metafileFilter, 0, 0 ); + swprintf( filter, ARRAY_SIZE(filter), L"%s%c*.wmf;*.emf%c", metafileFilter, 0, 0 ); ofn.lpstrFilter = filter; ofn.hwndOwner = hWnd; @@ -217,7 +216,6 @@ static void UpdateWindowCaption(void) { WCHAR szCaption[MAX_PATH]; WCHAR szView[MAX_PATH]; - static const WCHAR hyphenW[] = { ' ','-',' ',0 }; LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); @@ -225,7 +223,7 @@ static void UpdateWindowCaption(void) { lstrcpyW(szCaption, szFileTitle); LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); - lstrcatW(szCaption, hyphenW); + lstrcatW(szCaption, L" - "); lstrcatW(szCaption, szView); } else -- 2.26.2

1 0

[PATCH] taskkill: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/taskkill/taskkill.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 600bab14fde..193ed058297 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -102,12 +102,11 @@ static int WINAPIV taskkill_message_printfW(int msg, ...) static int taskkill_message(int msg) { - static const WCHAR formatW[] = {'%','1',0}; WCHAR msg_buffer[8192]; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - return taskkill_printfW(formatW, msg_buffer); + return taskkill_printfW(L"%1", msg_buffer); } /* Post WM_CLOSE to all top-level windows belonging to the process with specified PID. */ @@ -444,12 +443,6 @@ static BOOL add_to_task_list(WCHAR *name) * options are detected as parameters when placed after options that accept one. */ static BOOL process_arguments(int argc, WCHAR *argv[]) { - static const WCHAR opForceTerminate[] = {'f',0}; - static const WCHAR opImage[] = {'i','m',0}; - static const WCHAR opPID[] = {'p','i','d',0}; - static const WCHAR opHelp[] = {'?',0}; - static const WCHAR opTerminateChildren[] = {'t',0}; - if (argc > 1) { int i; @@ -460,7 +453,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) if (argc == 2) { argdata = argv[1]; - if ((*argdata == '/' || *argdata == '-') && !lstrcmpW(opHelp, argdata + 1)) + if ((*argdata == '/' || *argdata == '-') && !lstrcmpW(L"?", argdata + 1)) { taskkill_message(STRING_USAGE); exit(0); @@ -476,14 +469,14 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) goto invalid; argdata++; - if (!wcsicmp(opTerminateChildren, argdata)) + if (!wcsicmp(L"t", argdata)) WINE_FIXME("argument T not supported\n"); - if (!wcsicmp(opForceTerminate, argdata)) + if (!wcsicmp(L"f", argdata)) force_termination = TRUE; /* Options /IM and /PID appear to behave identically, except for * the fact that they cannot be specified at the same time. */ - else if ((got_im = !wcsicmp(opImage, argdata)) || - (got_pid = !wcsicmp(opPID, argdata))) + else if ((got_im = !wcsicmp(L"im", argdata)) || + (got_pid = !wcsicmp(L"pid", argdata))) { if (!argv[i + 1]) { -- 2.26.2

1 0

[PATCH] sc: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/sc/sc.c | 123 +++++++++++++++-------------------------------- 1 file changed, 40 insertions(+), 83 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index c9744afee36..a20813b8cd5 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -43,16 +43,6 @@ struct create_params static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_params *cp ) { - static const WCHAR displaynameW[] = {'d','i','s','p','l','a','y','n','a','m','e','=',0}; - static const WCHAR typeW[] = {'t','y','p','e','=',0}; - static const WCHAR startW[] = {'s','t','a','r','t','=',0}; - static const WCHAR errorW[] = {'e','r','r','o','r','=',0}; - static const WCHAR binpathW[] = {'b','i','n','p','a','t','h','=',0}; - static const WCHAR groupW[] = {'g','r','o','u','p','=',0}; - static const WCHAR tagW[] = {'t','a','g','=',0}; - static const WCHAR dependW[] = {'d','e','p','e','n','d','=',0}; - static const WCHAR objW[] = {'o','b','j','=',0}; - static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d','=',0}; unsigned int i; cp->displayname = NULL; @@ -68,63 +58,44 @@ static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_pa for (i = 0; i < argc; i++) { - if (!wcsicmp( argv[i], displaynameW ) && i < argc - 1) cp->displayname = argv[i + 1]; - if (!wcsicmp( argv[i], binpathW ) && i < argc - 1) cp->binpath = argv[i + 1]; - if (!wcsicmp( argv[i], groupW ) && i < argc - 1) cp->group = argv[i + 1]; - if (!wcsicmp( argv[i], dependW ) && i < argc - 1) cp->depend = argv[i + 1]; - if (!wcsicmp( argv[i], objW ) && i < argc - 1) cp->obj = argv[i + 1]; - if (!wcsicmp( argv[i], passwordW ) && i < argc - 1) cp->password = argv[i + 1]; + if (!wcsicmp( argv[i], L"displayname=" ) && i < argc - 1) cp->displayname = argv[i + 1]; + if (!wcsicmp( argv[i], L"binpath=" ) && i < argc - 1) cp->binpath = argv[i + 1]; + if (!wcsicmp( argv[i], L"group=" ) && i < argc - 1) cp->group = argv[i + 1]; + if (!wcsicmp( argv[i], L"depend=" ) && i < argc - 1) cp->depend = argv[i + 1]; + if (!wcsicmp( argv[i], L"obj=" ) && i < argc - 1) cp->obj = argv[i + 1]; + if (!wcsicmp( argv[i], L"password=" ) && i < argc - 1) cp->password = argv[i + 1]; - if (!wcsicmp( argv[i], tagW ) && i < argc - 1) + if (!wcsicmp( argv[i], L"tag=" ) && i < argc - 1) { - static const WCHAR yesW[] = {'y','e','s',0}; - if (!wcsicmp( argv[i], yesW )) + if (!wcsicmp( argv[i], L"yes" )) { WINE_FIXME("tag argument not supported\n"); cp->tag = TRUE; } } - if (!wcsicmp( argv[i], typeW ) && i < argc - 1) + if (!wcsicmp( argv[i], L"type=" ) && i < argc - 1) { - static const WCHAR ownW[] = {'o','w','n',0}; - static const WCHAR shareW[] = {'s','h','a','r','e',0}; - static const WCHAR kernelW[] = {'k','e','r','n','e','l',0}; - static const WCHAR filesysW[] = {'f','i','l','e','s','y','s',0}; - static const WCHAR recW[] = {'r','e','c',0}; - static const WCHAR interactW[] = {'i','n','t','e','r','a','c','t',0}; - - if (!wcsicmp( argv[i + 1], ownW )) cp->type = SERVICE_WIN32_OWN_PROCESS; - if (!wcsicmp( argv[i + 1], shareW )) cp->type = SERVICE_WIN32_SHARE_PROCESS; - if (!wcsicmp( argv[i + 1], kernelW )) cp->type = SERVICE_KERNEL_DRIVER; - if (!wcsicmp( argv[i + 1], filesysW )) cp->type = SERVICE_FILE_SYSTEM_DRIVER; - if (!wcsicmp( argv[i + 1], recW )) cp->type = SERVICE_RECOGNIZER_DRIVER; - if (!wcsicmp( argv[i + 1], interactW )) cp->type |= SERVICE_INTERACTIVE_PROCESS; + if (!wcsicmp( argv[i + 1], L"own" )) cp->type = SERVICE_WIN32_OWN_PROCESS; + if (!wcsicmp( argv[i + 1], L"share" )) cp->type = SERVICE_WIN32_SHARE_PROCESS; + if (!wcsicmp( argv[i + 1], L"kernel" )) cp->type = SERVICE_KERNEL_DRIVER; + if (!wcsicmp( argv[i + 1], L"filesys" )) cp->type = SERVICE_FILE_SYSTEM_DRIVER; + if (!wcsicmp( argv[i + 1], L"rec" )) cp->type = SERVICE_RECOGNIZER_DRIVER; + if (!wcsicmp( argv[i + 1], L"interact" )) cp->type |= SERVICE_INTERACTIVE_PROCESS; } - if (!wcsicmp( argv[i], startW ) && i < argc - 1) + if (!wcsicmp( argv[i], L"start="L"start" ) && i < argc - 1) { - static const WCHAR bootW[] = {'b','o','o','t',0}; - static const WCHAR systemW[] = {'s','y','s','t','e','m',0}; - static const WCHAR autoW[] = {'a','u','t','o',0}; - static const WCHAR demandW[] = {'d','e','m','a','n','d',0}; - static const WCHAR disabledW[] = {'d','i','s','a','b','l','e','d',0}; - - if (!wcsicmp( argv[i + 1], bootW )) cp->start = SERVICE_BOOT_START; - if (!wcsicmp( argv[i + 1], systemW )) cp->start = SERVICE_SYSTEM_START; - if (!wcsicmp( argv[i + 1], autoW )) cp->start = SERVICE_AUTO_START; - if (!wcsicmp( argv[i + 1], demandW )) cp->start = SERVICE_DEMAND_START; - if (!wcsicmp( argv[i + 1], disabledW )) cp->start = SERVICE_DISABLED; + if (!wcsicmp( argv[i + 1], L"boot" )) cp->start = SERVICE_BOOT_START; + if (!wcsicmp( argv[i + 1], L"system" )) cp->start = SERVICE_SYSTEM_START; + if (!wcsicmp( argv[i + 1], L"auto" )) cp->start = SERVICE_AUTO_START; + if (!wcsicmp( argv[i + 1], L"demand" )) cp->start = SERVICE_DEMAND_START; + if (!wcsicmp( argv[i + 1], L"disabled" )) cp->start = SERVICE_DISABLED; } - if (!wcsicmp( argv[i], errorW ) && i < argc - 1) + if (!wcsicmp( argv[i], L"error=" ) && i < argc - 1) { - static const WCHAR normalW[] = {'n','o','r','m','a','l',0}; - static const WCHAR severeW[] = {'s','e','v','e','r','e',0}; - static const WCHAR criticalW[] = {'c','r','i','t','i','c','a','l',0}; - static const WCHAR ignoreW[] = {'i','g','n','o','r','e',0}; - - if (!wcsicmp( argv[i + 1], normalW )) cp->error = SERVICE_ERROR_NORMAL; - if (!wcsicmp( argv[i + 1], severeW )) cp->error = SERVICE_ERROR_SEVERE; - if (!wcsicmp( argv[i + 1], criticalW )) cp->error = SERVICE_ERROR_CRITICAL; - if (!wcsicmp( argv[i + 1], ignoreW )) cp->error = SERVICE_ERROR_IGNORE; + if (!wcsicmp( argv[i + 1], L"normal" )) cp->error = SERVICE_ERROR_NORMAL; + if (!wcsicmp( argv[i + 1], L"severe" )) cp->error = SERVICE_ERROR_SEVERE; + if (!wcsicmp( argv[i + 1], L"critical" )) cp->error = SERVICE_ERROR_CRITICAL; + if (!wcsicmp( argv[i + 1], L"ignore" )) cp->error = SERVICE_ERROR_IGNORE; } } if (!cp->binpath) return FALSE; @@ -133,9 +104,6 @@ static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_pa static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *fa ) { - static const WCHAR runW[] = {'r','u','n',0}; - static const WCHAR restartW[] = {'r','e','s','t','a','r','t',0}; - static const WCHAR rebootW[] = {'r','e','b','o','o','t',0}; unsigned int i, count; WCHAR *actions, *p; @@ -164,9 +132,9 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f p = actions; for (i = 0; i < count; i++) { - if (!wcsicmp( p, runW )) fa->lpsaActions[i].Type = SC_ACTION_RUN_COMMAND; - else if (!wcsicmp( p, restartW )) fa->lpsaActions[i].Type = SC_ACTION_RESTART; - else if (!wcsicmp( p, rebootW )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; + if (!wcsicmp( p, L"run" )) fa->lpsaActions[i].Type = SC_ACTION_RUN_COMMAND; + else if (!wcsicmp( p, L"restart" )) fa->lpsaActions[i].Type = SC_ACTION_RESTART; + else if (!wcsicmp( p, L"reboot="L"reboot" )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; else fa->lpsaActions[i].Type = SC_ACTION_NONE; p += lstrlenW( p ) + 1; @@ -180,10 +148,6 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f static BOOL parse_failure_params( int argc, const WCHAR *argv[], SERVICE_FAILURE_ACTIONSW *fa ) { - static const WCHAR resetW[] = {'r','e','s','e','t','=',0}; - static const WCHAR rebootW[] = {'r','e','b','o','o','t','=',0}; - static const WCHAR commandW[] = {'c','o','m','m','a','n','d','=',0}; - static const WCHAR actionsW[] = {'a','c','t','i','o','n','s','=',0}; unsigned int i; fa->dwResetPeriod = 0; @@ -194,10 +158,10 @@ static BOOL parse_failure_params( int argc, const WCHAR *argv[], SERVICE_FAILURE for (i = 0; i < argc; i++) { - if (!wcsicmp( argv[i], resetW ) && i < argc - 1) fa->dwResetPeriod = wcstol( argv[i + 1], NULL, 10 ); - if (!wcsicmp( argv[i], rebootW ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; - if (!wcsicmp( argv[i], commandW ) && i < argc - 1) fa->lpCommand = (WCHAR *)argv[i + 1]; - if (!wcsicmp( argv[i], actionsW )) + if (!wcsicmp( argv[i], L"reset=" ) && i < argc - 1) fa->dwResetPeriod = wcstol( argv[i + 1], NULL, 10 ); + if (!wcsicmp( argv[i], L"reboot="L"reboot" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; + if (!wcsicmp( argv[i], L"command=" ) && i < argc - 1) fa->lpCommand = (WCHAR *)argv[i + 1]; + if (!wcsicmp( argv[i], L"actions=" )) { if (i == argc - 1) return FALSE; if (!parse_failure_actions( argv[i + 1], fa )) return FALSE; @@ -214,13 +178,6 @@ static void usage( void ) int __cdecl wmain( int argc, const WCHAR *argv[] ) { - static const WCHAR createW[] = {'c','r','e','a','t','e',0}; - static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR failureW[] = {'f','a','i','l','u','r','e',0}; - static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; - static const WCHAR startW[] = {'s','t','a','r','t',0}; - static const WCHAR stopW[] = {'s','t','o','p',0}; - static const WCHAR sdsetW[] = {'s','d','s','e','t',0}; SC_HANDLE manager, service; SERVICE_STATUS status; BOOL ret = FALSE; @@ -240,7 +197,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) return 1; } - if (!wcsicmp( argv[1], createW )) + if (!wcsicmp( argv[1], L"create" )) { struct create_params cp; @@ -265,7 +222,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to create service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], descriptionW )) + else if (!wcsicmp( argv[1], L"description" )) { service = OpenServiceW( manager, argv[2], SERVICE_CHANGE_CONFIG ); if (service) @@ -278,7 +235,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], failureW )) + else if (!wcsicmp( argv[1], L"failure" )) { service = OpenServiceW( manager, argv[2], SERVICE_CHANGE_CONFIG ); if (service) @@ -296,7 +253,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], deleteW )) + else if (!wcsicmp( argv[1], L"delete" )) { service = OpenServiceW( manager, argv[2], DELETE ); if (service) @@ -307,7 +264,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], startW )) + else if (!wcsicmp( argv[1], L"start="L"start" )) { service = OpenServiceW( manager, argv[2], SERVICE_START ); if (service) @@ -318,7 +275,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], stopW )) + else if (!wcsicmp( argv[1], L"stop" )) { service = OpenServiceW( manager, argv[2], SERVICE_STOP ); if (service) @@ -329,7 +286,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], sdsetW )) + else if (!wcsicmp( argv[1], L"sdset" )) { WINE_FIXME("SdSet command not supported, faking success\n"); ret = TRUE; -- 2.26.2

1 0

[PATCH v2] mountmgr: Avoid unnecessary permission prompts on macOS 10.15 and newer.
by Brendan Shanks 06 Oct '20

06 Oct '20

On macOS 10.15 and newer, trying to open the device node of a removable drive will trigger an "<app> would like to access files on a removable volume" permission prompt, even if the user doesn't have permissions to access the device node (which is almost always the case). Check the value of access() (recommended by Apple for this purpose) before opening devices. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: Forgot sign-off. dlls/mountmgr.sys/device.c | 7 +++++++ dlls/mountmgr.sys/diskarb.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index ccb0685cedd..53ccd3c5fdc 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include <stdio.h> #include <fcntl.h> +#include <unistd.h> #include <sys/time.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> @@ -1026,6 +1027,12 @@ static BOOL get_volume_device_info( struct volume *volume ) if (!unix_device) return FALSE; + if (access( unix_device, R_OK )) + { + WARN("Unable to open %s, not accessible\n", debugstr_a(unix_device)); + return FALSE; + } + if (!(name = wine_get_dos_file_name( unix_device ))) { ERR("Failed to convert %s to NT, err %u\n", debugstr_a(unix_device), GetLastError()); diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 12da89d7688..25e0745372a 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -25,6 +25,7 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> +#include <unistd.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif @@ -150,7 +151,8 @@ static void appeared_callback( DADiskRef disk, void *context ) else if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, NULL ); - if ((fd = open( device, O_RDONLY )) >= 0) + if (!access( device, R_OK ) && + (fd = open( device, O_RDONLY )) >= 0) { dk_scsi_identify_t dsi; -- 2.26.2

1 0

[PATCH 4/5] conhost: Use better default values in create_screen_buffer.
by Jacek Caban 06 Oct '20

06 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 21 +++++++++++++++++++++ programs/conhost/conhost.c | 21 ++++++++++++++++----- 2 files changed, 37 insertions(+), 5 deletions(-)

2 1

[PATCH 3/3] dxgi: Support Alt+Enter for d3d12 swapchains.
by Zhiyi Zhang 06 Oct '20

06 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 51 ++++++++++++++++++++++++++++++++++++++---- dlls/dxgi/tests/dxgi.c | 16 ++++++------- 2 files changed, 54 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index aa889bbe236..e74717056cb 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1919,6 +1919,7 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) close_library(vulkan_module); + wined3d_swapchain_state_unregister(swapchain->state); wined3d_swapchain_state_destroy(swapchain->state); } @@ -2289,18 +2290,37 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapCha BOOL *fullscreen, IDXGIOutput **target) { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); + BOOL windowed; + HRESULT hr; TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); - if (fullscreen) + if (fullscreen || target) { wined3d_mutex_lock(); - *fullscreen = !wined3d_swapchain_state_is_windowed(swapchain->state); + windowed = wined3d_swapchain_state_is_windowed(swapchain->state); wined3d_mutex_unlock(); } - if (target && (*target = swapchain->target)) - IDXGIOutput_AddRef(*target); + if (fullscreen) + *fullscreen = !windowed; + + if (target) + { + if (!windowed) + { + if (!swapchain->target && FAILED(hr = IDXGISwapChain4_GetContainingOutput(iface, + &swapchain->target))) + return hr; + + *target = swapchain->target; + IDXGIOutput_AddRef(*target); + } + else + { + *target = NULL; + } + } return S_OK; } @@ -2936,6 +2956,24 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return TRUE; } +static void STDMETHODCALLTYPE d3d12_swapchain_windowed_state_changed(void *parent, BOOL windowed) +{ + struct d3d12_swapchain *swapchain = parent; + + TRACE("parent %p, windowed %d.\n", parent, windowed); + + if (windowed && swapchain->target) + { + IDXGIOutput_Release(swapchain->target); + swapchain->target = NULL; + } +} + +static const struct wined3d_swapchain_state_parent_ops d3d12_swapchain_state_parent_ops = +{ + d3d12_swapchain_windowed_state_changed, +}; + static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGIFactory *factory, ID3D12Device *device, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc) @@ -2944,6 +2982,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI struct wined3d_swapchain_desc wined3d_desc; VkWin32SurfaceCreateInfoKHR surface_desc; VkPhysicalDevice vk_physical_device; + struct dxgi_factory *dxgi_factory; VkFenceCreateInfo fence_desc; uint32_t queue_family_index; VkSurfaceKHR vk_surface; @@ -3025,6 +3064,10 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hr; } + dxgi_factory = unsafe_impl_from_IDXGIFactory((IDXGIFactory *)factory); + wined3d_swapchain_state_register(swapchain->state, dxgi_factory->wined3d, swapchain, + &d3d12_swapchain_state_parent_ops); + if (!fullscreen_desc->Windowed) { hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL); diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 5830426f756..c6ece51f2a8 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2431,7 +2431,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) flush_events(); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(!fullscreen, "Expect swapchain not full screen.\n"); + ok(!fullscreen, "Expect swapchain not full screen.\n"); /* Move the swapchain output window to the second output */ hr = IDXGIOutput_GetDesc(output2, &output_desc2); @@ -2453,7 +2453,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); IDXGIOutput_Release(output); @@ -2465,7 +2465,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); @@ -6148,7 +6148,6 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) UINT flag; BOOL expect_fullscreen; BOOL broken_d3d10; - BOOL todo_on_d3d12; } tests[] = { @@ -6162,15 +6161,15 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) * - Posting them hangs the posting thread. Another thread that keeps * sending input is needed to avoid the hang. The hang is not * because of flush_events(). */ - {0, TRUE, FALSE, TRUE}, + {0, TRUE}, {0, FALSE}, {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, - {DXGI_MWA_NO_ALT_ENTER, FALSE, TRUE}, + {DXGI_MWA_NO_ALT_ENTER}, {DXGI_MWA_NO_ALT_ENTER, FALSE}, - {DXGI_MWA_NO_PRINT_SCREEN, TRUE, FALSE, TRUE}, + {DXGI_MWA_NO_PRINT_SCREEN, TRUE}, {DXGI_MWA_NO_PRINT_SCREEN, FALSE}, - {0, TRUE, FALSE, TRUE}, + {0, TRUE}, {0, FALSE} }; @@ -6272,7 +6271,6 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) output = NULL; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(is_d3d12 && tests[i].todo_on_d3d12) ok(fullscreen == tests[i].expect_fullscreen || broken(tests[i].broken_d3d10 && fullscreen), "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); -- 2.25.1

2 1

[PATCH 2/3] dxgi: Update swapchain containing output after Alt+Enter was used to exit fullscreen.
by Zhiyi Zhang 06 Oct '20

06 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 21 ++++++++++++++++++++- dlls/dxgi/tests/dxgi.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++++ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 6 +++++- dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 8 +++++++- 7 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 9d6ec0246ce..aa889bbe236 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -807,6 +807,24 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = d3d11_swapchain_wined3d_object_released, }; +static void STDMETHODCALLTYPE d3d11_swapchain_windowed_state_changed(void *parent, BOOL windowed) +{ + struct d3d11_swapchain *swapchain = parent; + + TRACE("parent %p, windowed %d.\n", parent, windowed); + + if (windowed && swapchain->target) + { + IDXGIOutput_Release(swapchain->target); + swapchain->target = NULL; + } +} + +static const struct wined3d_swapchain_state_parent_ops d3d11_swapchain_state_parent_ops = +{ + d3d11_swapchain_windowed_state_changed, +}; + HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc) { @@ -855,7 +873,8 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi swapchain->state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); wined3d = wined3d_device_get_wined3d(device->wined3d_device); - wined3d_swapchain_state_register(swapchain->state, wined3d); + wined3d_swapchain_state_register(swapchain->state, wined3d, swapchain, + &d3d11_swapchain_state_parent_ops); swapchain->target = NULL; if (fullscreen) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f747e236f31..5830426f756 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2453,7 +2453,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + todo_wine_if(is_d3d12) ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); IDXGIOutput_Release(output); @@ -2465,7 +2465,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + todo_wine_if(is_d3d12) ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2cf36d189cb..a36946cc620 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2171,6 +2171,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st { struct wined3d_display_mode actual_mode; struct wined3d_output_desc output_desc; + BOOL windowed = state->desc.windowed; HRESULT hr; TRACE("state %p, swapchain_desc %p, mode %p.\n", state, swapchain_desc, mode); @@ -2259,6 +2260,9 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st state->desc.output = swapchain_desc->output; state->desc.windowed = swapchain_desc->windowed; + if (state->parent_ops && windowed != state->desc.windowed) + state->parent_ops->windowed_state_changed(state->parent, state->desc.windowed); + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 816108e8b3b..4c42b0854e1 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -292,7 +292,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_is_windowed(ptr) -@ cdecl wined3d_swapchain_state_register(ptr ptr) +@ cdecl wined3d_swapchain_state_register(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr) @ cdecl wined3d_swapchain_state_unregister(ptr) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index bb3ad7ffa51..09d741ac87f 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -775,7 +775,8 @@ static struct wined3d_window_hook *wined3d_find_hook(DWORD thread_id) } void CDECL wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, - struct wined3d *wined3d) + struct wined3d *wined3d, void *parent, + const struct wined3d_swapchain_state_parent_ops *parent_ops) { struct wined3d_registered_swapchain_state *state_entry; struct wined3d_window_hook *hook; @@ -789,6 +790,9 @@ void CDECL wined3d_swapchain_state_register(struct wined3d_swapchain_state *stat return; } + state->parent = parent; + state->parent_ops = parent_ops; + state_entry = &swapchain_state_table.states[swapchain_state_table.state_count++]; state_entry->state = state; state_entry->wined3d = wined3d; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7c88e04f5e7..0d14f1e2860 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5062,6 +5062,9 @@ struct wined3d_swapchain_state LONG style; LONG exstyle; HWND device_window; + + void *parent; + const struct wined3d_swapchain_state_parent_ops *parent_ops; }; void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3f2361e55a5..9d2d37c4856 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2208,6 +2208,11 @@ struct wined3d_parent_ops void (__stdcall *wined3d_object_destroyed)(void *parent); }; +struct wined3d_swapchain_state_parent_ops +{ + void (__stdcall *windowed_state_changed)(void *parent, BOOL windowed); +}; + struct wined3d; struct wined3d_adapter; struct wined3d_blend_state; @@ -2807,7 +2812,8 @@ HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_de void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); BOOL __cdecl wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state); void __cdecl wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, - struct wined3d *wined3d); + struct wined3d *wined3d, void *context, + const struct wined3d_swapchain_state_parent_ops *parent_ops); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, -- 2.25.1

2 1

[PATCH] mmdevapi: Implement ActivateAudioInterfaceAsync
by Andrew Eikum 06 Oct '20

06 Oct '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/mmdevapi/main.c | 165 +++++++++++++++++++++++++++ dlls/mmdevapi/mmdevapi.spec | 2 + dlls/mmdevapi/tests/mmdevenum.c | 190 ++++++++++++++++++++++++++++++++ include/mmdeviceapi.idl | 36 ++++++ 4 files changed, 393 insertions(+) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 7680b451381..8e9127a7507 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -319,3 +319,168 @@ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources( instance ); } + +struct activate_async_op { + IActivateAudioInterfaceAsyncOperation IActivateAudioInterfaceAsyncOperation_iface; + LONG ref; + + IActivateAudioInterfaceCompletionHandler *callback; + HRESULT result_hr; + IUnknown *result_iface; +}; + +static struct activate_async_op *impl_from_IActivateAudioInterfaceAsyncOperation(IActivateAudioInterfaceAsyncOperation *iface) +{ + return CONTAINING_RECORD(iface, struct activate_async_op, IActivateAudioInterfaceAsyncOperation_iface); +} + +static HRESULT WINAPI activate_async_op_QueryInterface(IActivateAudioInterfaceAsyncOperation *iface, + REFIID riid, void **ppv) +{ + struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IActivateAudioInterfaceAsyncOperation)) { + *ppv = &This->IActivateAudioInterfaceAsyncOperation_iface; + } else { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI activate_async_op_AddRef(IActivateAudioInterfaceAsyncOperation *iface) +{ + struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) refcount now %i\n", This, ref); + return ref; +} + +static ULONG WINAPI activate_async_op_Release(IActivateAudioInterfaceAsyncOperation *iface) +{ + struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); + LONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) refcount now %i\n", This, ref); + if (!ref) { + if(This->result_iface) + IUnknown_Release(This->result_iface); + IActivateAudioInterfaceCompletionHandler_Release(This->callback); + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI activate_async_op_GetActivateResult(IActivateAudioInterfaceAsyncOperation *iface, + HRESULT *result_hr, IUnknown **result_iface) +{ + struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); + + TRACE("(%p)->(%p, %p)\n", This, result_hr, result_iface); + + *result_hr = This->result_hr; + + if(This->result_hr == S_OK){ + *result_iface = This->result_iface; + IUnknown_AddRef(*result_iface); + } + + return S_OK; +} + +static IActivateAudioInterfaceAsyncOperationVtbl IActivateAudioInterfaceAsyncOperation_vtbl = { + activate_async_op_QueryInterface, + activate_async_op_AddRef, + activate_async_op_Release, + activate_async_op_GetActivateResult, +}; + +static DWORD WINAPI activate_async_threadproc(void *user) +{ + struct activate_async_op *op = user; + + IActivateAudioInterfaceCompletionHandler_ActivateCompleted(op->callback, &op->IActivateAudioInterfaceAsyncOperation_iface); + + IActivateAudioInterfaceAsyncOperation_Release(&op->IActivateAudioInterfaceAsyncOperation_iface); + + return 0; +} + +static HRESULT get_mmdevice_by_activatepath(const WCHAR *path, IMMDevice **mmdev) +{ + IMMDeviceEnumerator *devenum; + HRESULT hr; + + static const WCHAR DEVINTERFACE_AUDIO_RENDER_WSTR[] = L"{E6327CAD-DCEC-4949-AE8A-991E976A79D2}"; + static const WCHAR DEVINTERFACE_AUDIO_CAPTURE_WSTR[] = L"{2EEF81BE-33FA-4800-9670-1CD474972C3F}"; + + hr = MMDevEnum_Create(&IID_IMMDeviceEnumerator, (void**)&devenum); + if (FAILED(hr)) { + WARN("Failed to create MMDeviceEnumerator: %08x\n", hr); + return hr; + } + + if (!lstrcmpiW(path, DEVINTERFACE_AUDIO_RENDER_WSTR)){ + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eRender, eMultimedia, mmdev); + } else if (!lstrcmpiW(path, DEVINTERFACE_AUDIO_CAPTURE_WSTR)){ + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eCapture, eMultimedia, mmdev); + } else { + FIXME("How to map path to device id? %s\n", debugstr_w(path)); + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + if (FAILED(hr)) { + WARN("Failed to get requested device (%s): %08x\n", debugstr_w(path), hr); + *mmdev = NULL; + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + IMMDeviceEnumerator_Release(devenum); + + return hr; +} + +/*********************************************************************** + * ActivateAudioInterfaceAsync (MMDEVAPI.17) + */ +HRESULT WINAPI ActivateAudioInterfaceAsync(const WCHAR *path, REFIID riid, + PROPVARIANT *params, IActivateAudioInterfaceCompletionHandler *done_handler, + IActivateAudioInterfaceAsyncOperation **op_out) +{ + struct activate_async_op *op; + HANDLE ht; + IMMDevice *mmdev; + + TRACE("(%s, %s, %p, %p, %p)\n", debugstr_w(path), debugstr_guid(riid), + params, done_handler, op_out); + + op = HeapAlloc(GetProcessHeap(), 0, sizeof(*op)); + if (!op) + return E_OUTOFMEMORY; + + op->ref = 2; /* returned ref and threadproc ref */ + op->IActivateAudioInterfaceAsyncOperation_iface.lpVtbl = &IActivateAudioInterfaceAsyncOperation_vtbl; + op->callback = done_handler; + IActivateAudioInterfaceCompletionHandler_AddRef(done_handler); + + op->result_hr = get_mmdevice_by_activatepath(path, &mmdev); + if (SUCCEEDED(op->result_hr)) { + op->result_hr = IMMDevice_Activate(mmdev, riid, CLSCTX_INPROC_SERVER, params, (void**)&op->result_iface); + IMMDevice_Release(mmdev); + }else + op->result_iface = NULL; + + ht = CreateThread(NULL, 0, &activate_async_threadproc, op, 0, NULL); + CloseHandle(ht); + + *op_out = &op->IActivateAudioInterfaceAsyncOperation_iface; + + return S_OK; +} diff --git a/dlls/mmdevapi/mmdevapi.spec b/dlls/mmdevapi/mmdevapi.spec index 88aaf7c30c9..90ecaf569bc 100644 --- a/dlls/mmdevapi/mmdevapi.spec +++ b/dlls/mmdevapi/mmdevapi.spec @@ -12,6 +12,8 @@ 13 stub @ 14 stub @ 15 stub @ +16 stub @ +17 stdcall ActivateAudioInterfaceAsync( wstr ptr ptr ptr ptr ) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject( ptr ptr ptr ) diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 4f8c848380d..11df1f0229b 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -31,6 +31,9 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static UINT g_num_mmdevs; +static WCHAR g_device_path[MAX_PATH]; + /* Some of the QueryInterface tests are really just to check if I got the IIDs right :) */ /* IMMDeviceCollection appears to have no QueryInterface method and instead forwards to mme */ @@ -85,6 +88,8 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) ok(hr == E_INVALIDARG, "Asking for too high device returned 0x%08x\n", hr); ok(dev == NULL, "Returned non-null device\n"); + g_num_mmdevs = numdev; + if (numdev) { hr = IMMDeviceCollection_Item(col, 0, NULL); @@ -101,6 +106,7 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) { IMMDevice *dev2; + lstrcpyW(g_device_path, id); temp[sizeof(temp)-1] = 0; WideCharToMultiByte(CP_ACP, 0, id, -1, temp, sizeof(temp)-1, NULL, NULL); trace("Device found: %s\n", temp); @@ -119,6 +125,188 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) IMMDeviceCollection_Release(col); } +static struct { + LONG ref; + HANDLE evt; + CRITICAL_SECTION lock; + IActivateAudioInterfaceAsyncOperation *op; + DWORD main_tid; + char msg_pfx[128]; + IUnknown *result_iface; + HRESULT result_hr; +} async_activate_test; + +static HRESULT WINAPI async_activate_QueryInterface( + IActivateAudioInterfaceCompletionHandler *iface, + REFIID riid, + void **ppvObject) +{ + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IAgileObject) || + IsEqualIID(riid, &IID_IActivateAudioInterfaceCompletionHandler)){ + *ppvObject = iface; + IUnknown_AddRef((IUnknown*)*ppvObject); + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI async_activate_AddRef( + IActivateAudioInterfaceCompletionHandler *iface) +{ + return InterlockedIncrement(&async_activate_test.ref); +} + +static ULONG WINAPI async_activate_Release( + IActivateAudioInterfaceCompletionHandler *iface) +{ + ULONG ref = InterlockedDecrement(&async_activate_test.ref); + if(ref == 1) + SetEvent(async_activate_test.evt); + return ref; +} + +static HRESULT WINAPI async_activate_ActivateCompleted( + IActivateAudioInterfaceCompletionHandler *iface, + IActivateAudioInterfaceAsyncOperation *op) +{ + HRESULT hr; + + EnterCriticalSection(&async_activate_test.lock); + ok(op == async_activate_test.op, + "%s: Got different completion operation\n", + async_activate_test.msg_pfx); + LeaveCriticalSection(&async_activate_test.lock); + + ok(GetCurrentThreadId() != async_activate_test.main_tid, + "%s: Expected callback on worker thread\n", + async_activate_test.msg_pfx); + + hr = IActivateAudioInterfaceAsyncOperation_GetActivateResult(op, + &async_activate_test.result_hr, &async_activate_test.result_iface); + ok(hr == S_OK, + "%s: GetActivateResult failed: %08x\n", + async_activate_test.msg_pfx, hr); + + return S_OK; +} + +static IActivateAudioInterfaceCompletionHandlerVtbl async_activate_vtbl = { + async_activate_QueryInterface, + async_activate_AddRef, + async_activate_Release, + async_activate_ActivateCompleted, +}; + +static IActivateAudioInterfaceCompletionHandler async_activate_done = { + &async_activate_vtbl +}; + +static void test_ActivateAudioInterfaceAsync(void) +{ + HRESULT (* WINAPI pActivateAudioInterfaceAsync)(const WCHAR *path, + REFIID riid, PROPVARIANT *params, + IActivateAudioInterfaceCompletionHandler *done_handler, + IActivateAudioInterfaceAsyncOperation **op); + HANDLE h_mmdev; + HRESULT hr; + LPOLESTR path; + DWORD dr; + IAudioClient3 *ac3; + + h_mmdev = LoadLibraryA("mmdevapi.dll"); + + /* some applications look this up by ordinal */ + pActivateAudioInterfaceAsync = (void*)GetProcAddress(h_mmdev, (char *)17); + ok(pActivateAudioInterfaceAsync != NULL, "mmdevapi.ActivateAudioInterfaceAsync missing!\n"); + + async_activate_test.ref = 1; + async_activate_test.evt = CreateEventW(NULL, FALSE, FALSE, NULL); + InitializeCriticalSection(&async_activate_test.lock); + async_activate_test.op = NULL; + async_activate_test.main_tid = GetCurrentThreadId(); + async_activate_test.result_iface = NULL; + async_activate_test.result_hr = 0; + + + /* try invalid device path */ + strcpy(async_activate_test.msg_pfx, "invalid_path"); + + EnterCriticalSection(&async_activate_test.lock); + hr = pActivateAudioInterfaceAsync(L"winetest_bogus", &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + LeaveCriticalSection(&async_activate_test.lock); + + IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); + + dr = WaitForSingleObject(async_activate_test.evt, 1000); /* wait for all refs other than our own to be released */ + ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); + ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref: %u\n", async_activate_test.ref); + ok(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + ok(async_activate_test.result_iface == NULL, "Got non-NULL iface pointer: %p\n", async_activate_test.result_iface); + + + /* device id from IMMDevice does not work */ + if(g_num_mmdevs > 0){ + strcpy(async_activate_test.msg_pfx, "mmdevice_id"); + + EnterCriticalSection(&async_activate_test.lock); + hr = pActivateAudioInterfaceAsync(g_device_path, &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + LeaveCriticalSection(&async_activate_test.lock); + + IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); + + dr = WaitForSingleObject(async_activate_test.evt, 1000); + ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); + ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref: %u\n", async_activate_test.ref); + ok(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + ok(async_activate_test.result_iface == NULL, "Got non-NULL iface pointer: %p\n", async_activate_test.result_iface); + } + + + /* try DEVINTERFACE_AUDIO_RENDER */ + strcpy(async_activate_test.msg_pfx, "audio_render"); + StringFromIID(&DEVINTERFACE_AUDIO_RENDER, &path); + + EnterCriticalSection(&async_activate_test.lock); + hr = pActivateAudioInterfaceAsync(path, &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + LeaveCriticalSection(&async_activate_test.lock); + + IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); + + dr = WaitForSingleObject(async_activate_test.evt, 1000); + ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); + ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref\n"); + ok(async_activate_test.result_hr == S_OK || + (g_num_mmdevs == 0 && async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || /* no devices */ + broken(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), /* win8 doesn't support DEVINTERFACE_AUDIO_RENDER */ + "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + + if(async_activate_test.result_hr == S_OK){ + ok(async_activate_test.result_iface != NULL, "Got NULL iface pointer on success?\n"); + + /* returned iface should be the IID we requested */ + hr = IUnknown_QueryInterface(async_activate_test.result_iface, &IID_IAudioClient3, (void**)&ac3); + ok(hr == S_OK, "Failed to query IAudioClient3: %08x\n", hr); + ok(async_activate_test.result_iface == (IUnknown*)ac3, + "Activated interface other than IAudioClient3!\n"); + IAudioClient3_Release(ac3); + + IUnknown_Release(async_activate_test.result_iface); + } + + CoTaskMemFree(path); + + CloseHandle(async_activate_test.evt); + DeleteCriticalSection(&async_activate_test.lock); +} + static HRESULT WINAPI notif_QueryInterface(IMMNotificationClient *iface, const GUID *riid, void **obj) { @@ -285,4 +473,6 @@ START_TEST(mmdevenum) ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); IMMDeviceEnumerator_Release(mme); + + test_ActivateAudioInterfaceAsync(); } diff --git a/include/mmdeviceapi.idl b/include/mmdeviceapi.idl index d1fb6ae74ff..1c2bb18c33c 100644 --- a/include/mmdeviceapi.idl +++ b/include/mmdeviceapi.idl @@ -26,6 +26,8 @@ cpp_quote("#ifndef E_UNSUPPORTED_TYPE") cpp_quote("#define E_UNSUPPORTED_TYPE HRESULT_FROM_WIN32(ERROR_UNSUPPORTED_TYPE)") cpp_quote("#endif") +cpp_quote("DEFINE_GUID(DEVINTERFACE_AUDIO_RENDER, 0xe6327cad,0xdcec,0x4949,0xae,0x8a,0x99,0x1e,0x97,0x6a,0x79,0xd2);") +cpp_quote("DEFINE_GUID(DEVINTERFACE_AUDIO_CAPTURE, 0x2eef81be,0x33fa,0x4800,0x96,0x70,0x1c,0xd4,0x74,0x97,0x2c,0x3f);") cpp_quote("#define DEVICE_STATE_ACTIVE 0x1") cpp_quote("#define DEVICE_STATE_DISABLED 0x2") @@ -237,6 +239,40 @@ typedef struct _AudioExtensionParams IMMDevice *pPnpDevnode; } AudioExtensionParams; +[ + object, + local, + uuid(72a22d78-cde4-431d-b8cc-843a71199b6d), + nonextensible, + pointer_default(unique) +] +interface IActivateAudioInterfaceAsyncOperation : IUnknown +{ + HRESULT GetActivateResult( + [out] HRESULT *result, + [out] IUnknown **iface + ); +} + +[ + object, + local, + uuid(41d949ab-9862-444a-80f6-c261334da5eb), + nonextensible, + pointer_default(unique) +] +interface IActivateAudioInterfaceCompletionHandler : IUnknown +{ + HRESULT ActivateCompleted( + [in] IActivateAudioInterfaceAsyncOperation *op + ); +} + +cpp_quote("HRESULT WINAPI ActivateAudioInterfaceAsync(") +cpp_quote(" const WCHAR *path, REFIID riid, PROPVARIANT *params,") +cpp_quote(" IActivateAudioInterfaceCompletionHandler *done_handler,") +cpp_quote(" IActivateAudioInterfaceAsyncOperation **op);") + [ uuid(2fdaafa3-7523-4f66-9957-9d5e7fe698f6), version(1.0) -- 2.28.0

2 1

[PATCH v3 1/5] ntdll: Introduce RtlProcessFlsData() and use it for FLS data destruction.
by Paul Gofman 06 Oct '20

06 Oct '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernelbase/thread.c | 2 +- dlls/ntdll/loader.c | 3 ++- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 10 ++++++++++ include/winternl.h | 1 + 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 0bfef62a7da..f2b746856e1 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1022,7 +1022,7 @@ void WINAPI DECLSPEC_HOTPATCH DeleteFiber( LPVOID fiber_ptr ) RtlExitUserThread( 1 ); } RtlFreeUserStack( fiber->stack_allocation ); - HeapFree( GetProcessHeap(), 0, fiber->fls_slots ); + RtlProcessFlsData( fiber->fls_slots, 3 ); HeapFree( GetProcessHeap(), 0, fiber ); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 20bc3f977d1..cd27ce5658b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3255,7 +3255,8 @@ void WINAPI LdrShutdownThread(void) for (i = 0; i < tls_module_count; i++) RtlFreeHeap( GetProcessHeap(), 0, pointers[i] ); RtlFreeHeap( GetProcessHeap(), 0, pointers ); } - RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->FlsSlots ); + RtlProcessFlsData( NtCurrentTeb()->FlsSlots, 3 ); + NtCurrentTeb()->FlsSlots = NULL; RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->TlsExpansionSlots ); NtCurrentTeb()->TlsExpansionSlots = NULL; RtlReleasePebLock(); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ce9f6281d5d..6f44f499825 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -874,6 +874,7 @@ @ stdcall RtlPopFrame(ptr) @ stdcall RtlPrefixString(ptr ptr long) @ stdcall RtlPrefixUnicodeString(ptr ptr long) +@ stdcall RtlProcessFlsData(ptr long) @ stub RtlPropertySetNameToGuid @ stub RtlProtectHeap @ stdcall RtlPushFrame(ptr) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 716ef3b61d0..57292043582 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -343,3 +343,13 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsGetValue( ULONG index, void **data ) return STATUS_SUCCESS; } + + +/*********************************************************************** + * RtlProcessFlsData (NTDLL.@) + */ +void WINAPI DECLSPEC_HOTPATCH RtlProcessFlsData( void *teb_fls_data, ULONG flags ) +{ + if (flags & 2) + RtlFreeHeap( GetProcessHeap(), 0, teb_fls_data ); +} diff --git a/include/winternl.h b/include/winternl.h index 82328167c9e..75324635ed7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3480,6 +3480,7 @@ NTSYSAPI NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM); NTSYSAPI void WINAPI RtlPopFrame(TEB_ACTIVE_FRAME*); NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); +NTSYSAPI void WINAPI RtlProcessFlsData(void*,ULONG); NTSYSAPI void WINAPI RtlPushFrame(TEB_ACTIVE_FRAME*); NTSYSAPI NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings(DWORD,HANDLE,const WCHAR*,const WCHAR*,WCHAR*,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*); -- 2.26.2

2 9

[PATCH] mountmgr: Avoid unnecessary permission prompts on macOS 10.15 and newer.
by Brendan Shanks 06 Oct '20

06 Oct '20

On macOS 10.15 and newer, trying to open the device node of a removable drive will trigger an "<app> would like to access files on a removable volume" permission prompt, even if the user doesn't have permissions to access the device node (which is almost always the case). Check the value of access() (recommended by Apple for this purpose) before opening devices. --- dlls/mountmgr.sys/device.c | 7 +++++++ dlls/mountmgr.sys/diskarb.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index ccb0685cedd..53ccd3c5fdc 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include <stdio.h> #include <fcntl.h> +#include <unistd.h> #include <sys/time.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> @@ -1026,6 +1027,12 @@ static BOOL get_volume_device_info( struct volume *volume ) if (!unix_device) return FALSE; + if (access( unix_device, R_OK )) + { + WARN("Unable to open %s, not accessible\n", debugstr_a(unix_device)); + return FALSE; + } + if (!(name = wine_get_dos_file_name( unix_device ))) { ERR("Failed to convert %s to NT, err %u\n", debugstr_a(unix_device), GetLastError()); diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 12da89d7688..25e0745372a 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -25,6 +25,7 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> +#include <unistd.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif @@ -150,7 +151,8 @@ static void appeared_callback( DADiskRef disk, void *context ) else if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, NULL ); - if ((fd = open( device, O_RDONLY )) >= 0) + if (!access( device, R_OK ) && + (fd = open( device, O_RDONLY )) >= 0) { dk_scsi_identify_t dsi; -- 2.26.2

1 0

[RFC PATCH] PE conversion for dinput.dll and dinput8.dll
by Rémi Bernon 06 Oct '20

06 Oct '20

Hi! It seems like converting things to PE is all the rage these days, so I thought I could give it a try too. I don't know any application or games that requires dinput or dinput8 to be PE dlls, but I guess it wouldn't hurt any either. I did a PE + unix lib split, but apparently there were some plans to re-implement it over HID, so I'm just sending this as RFC, to see if there's any interest in it, or if the HID path is preferred. IMHO the HID path is much more work, so clearly not something achievable short term, and will possibly cause some feature regression. For instance the macos forcefeedback seems pretty straightforward to map to dinput and would be a shame to port over HID. Also HID is complicated add will add a lot of intermediate layers. The it can always be done in parallel or in addition to this split. I tried to make sure the unit tests as well as joy.cpl reported identical results, with an X-Box and a DualShock 4 gamepads, but I don't have any more specific joysticks to test with. For macos I just made sure that it builds, hopefully every single commit although I only checked the whole series. The series is quite long so I'm just attaching it as a single file that git am can split. Cheers, -- Rémi Bernon <rbernon(a)codeweavers.com>

1 0

[PATCH 5/5] kernel32/tests: Improve current console test mode.
by Jacek Caban 06 Oct '20

06 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-)

1 0

[PATCH 3/5] kernel32/tests: Move pseudo console tests before FreeConsole.
by Jacek Caban 06 Oct '20

06 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/5] conhost: Don't create tty input thread if we don't have tty_input handle.
by Jacek Caban 06 Oct '20

06 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 1/5] conhost: Scroll window to cursor position when needed.
by Jacek Caban 06 Oct '20

06 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)

1 0

[PATCH 1/6] winegstreamer: Insert videoconvert into decoded-video streams.
by Derek Lesho 06 Oct '20

06 Oct '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 113 +++++++++++++++++++++++++----- 1 file changed, 97 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5f3c43a0204..520f3c3177e 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -384,6 +384,42 @@ static const IMFMediaStreamVtbl media_stream_vtbl = media_stream_RequestSample }; +/* Setup a chain of elements which should hopefully allow transformations to any IMFMediaType + the user throws at us through gstreamer's caps negotiation. */ +static HRESULT media_stream_resolve(struct media_stream *stream) +{ + GstCaps *source_caps = gst_pad_query_caps(stream->their_src, NULL); + + if (!source_caps) + return E_FAIL; + + if (!strcmp(gst_structure_get_name(gst_caps_get_structure(source_caps, 0)), "video/x-raw")) + { + GstElement *videoconvert = gst_element_factory_make("videoconvert", NULL); + + gst_bin_add(GST_BIN(stream->parent_source->container), videoconvert); + + stream->my_sink = gst_element_get_static_pad(videoconvert, "sink"); + + assert(gst_pad_link(stream->their_src, stream->my_sink) == GST_PAD_LINK_OK); + assert(gst_element_link(videoconvert, stream->appsink)); + + gst_element_sync_state_with_parent(videoconvert); + + g_object_set(stream->appsink, "caps", source_caps, NULL); + } + else + { + stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink"); + g_object_set(stream->appsink, "caps", source_caps, NULL); + assert(gst_pad_link(stream->their_src, stream->my_sink) == GST_PAD_LINK_OK); + } + + gst_caps_unref(source_caps); + + return S_OK; +} + static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD stream_id, struct media_stream **out_stream) { struct media_stream *object = heap_alloc_zero(sizeof(*object)); @@ -414,8 +450,7 @@ static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD g_object_set(object->appsink, "sync", FALSE, NULL); g_object_set(object->appsink, "max-buffers", 5, NULL); - object->my_sink = gst_element_get_static_pad(object->appsink, "sink"); - gst_pad_link(object->their_src, object->my_sink); + media_stream_resolve(object); gst_element_sync_state_with_parent(object->appsink); @@ -435,28 +470,74 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) { GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src); IMFMediaTypeHandler *type_handler; + IMFMediaType **stream_types = NULL; IMFMediaType *stream_type = NULL; + DWORD type_count = 0; + unsigned int i; HRESULT hr; + if (!strcmp(gst_structure_get_name(gst_caps_get_structure(current_caps, 0)), "video/x-raw")) + { + GstElementFactory *videoconvert_factory = gst_element_factory_find("videoconvert"); + /* output every format supported by videoconvert */ + const GList *template_list = gst_element_factory_get_static_pad_templates(videoconvert_factory); + for (;template_list; template_list = template_list->next) + { + GstStaticPadTemplate *template = (GstStaticPadTemplate *)template_list->data; + GstCaps *src_caps; + GValueArray *formats; + if (template->direction != GST_PAD_SRC) + continue; + src_caps = gst_static_pad_template_get_caps(template); + gst_structure_get_list(gst_caps_get_structure(src_caps, 0), "format", &formats); + stream_types = heap_alloc( sizeof(IMFMediaType*) * formats->n_values ); + for (i = 0; i < formats->n_values; i++) + { + GValue *format = g_value_array_get_nth(formats, i); + GstCaps *modified_caps = gst_caps_copy(current_caps); + gst_caps_set_value(modified_caps, "format", format); + stream_types[type_count] = mf_media_type_from_caps(modified_caps); + gst_caps_unref(modified_caps); + if (stream_types[type_count]) + type_count++; + } + g_value_array_free(formats); + gst_caps_unref(src_caps); + break; + } + } + else + { + stream_type = mf_media_type_from_caps(current_caps); + if (stream_type) + { + stream_types = &stream_type; + type_count = 1; + } + } - stream_type = mf_media_type_from_caps(current_caps); gst_caps_unref(current_caps); - if (!stream_type) + if (!type_count) + { + ERR("Failed to establish an IMFMediaType from any of the possible stream caps!\n"); return E_FAIL; + } - hr = MFCreateStreamDescriptor(stream->stream_id, 1, &stream_type, &stream->descriptor); - - IMFMediaType_Release(stream_type); - - if (FAILED(hr)) - return hr; + if (FAILED(hr = MFCreateStreamDescriptor(stream->stream_id, type_count, stream_types, &stream->descriptor))) + goto done; if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) - return hr; - - hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_type); - - IMFMediaTypeHandler_Release(type_handler); - + goto done; + + if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0]))) + goto done; + +done: + if (type_handler) + IMFMediaTypeHandler_Release(type_handler); + for (i = 0; i < type_count; i++) + IMFMediaType_Release(stream_types[i]); + if (stream_types != &stream_type) + heap_free(stream_types); return hr; } -- 2.28.0

3 15

[PATCH v3 1/2] amstream: Implement AMDirectDrawStream::BeginFlush and ::EndFlush.
by Anton Baskanov 06 Oct '20

06 Oct '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/ddrawstream.c | 36 ++++++++-- dlls/amstream/tests/amstream.c | 128 ++++++++++++++++++++++++++++++++- 2 files changed, 157 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 98e81105f6e..befdd093b07 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -59,6 +59,7 @@ struct ddraw_stream struct format format; FILTER_STATE state; BOOL eos; + BOOL flushing; CONDITION_VARIABLE update_queued_cv; struct list update_queue; }; @@ -1142,7 +1143,7 @@ static HRESULT WINAPI ddraw_sink_EndOfStream(IPin *iface) EnterCriticalSection(&stream->cs); - if (stream->eos) + if (stream->eos || stream->flushing) { LeaveCriticalSection(&stream->cs); return E_FAIL; @@ -1159,14 +1160,34 @@ static HRESULT WINAPI ddraw_sink_EndOfStream(IPin *iface) static HRESULT WINAPI ddraw_sink_BeginFlush(IPin *iface) { - FIXME("iface %p, stub!\n", iface); - return E_NOTIMPL; + struct ddraw_stream *stream = impl_from_IPin(iface); + + TRACE("stream %p.\n", stream); + + EnterCriticalSection(&stream->cs); + + stream->flushing = TRUE; + stream->eos = FALSE; + WakeConditionVariable(&stream->update_queued_cv); + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI ddraw_sink_EndFlush(IPin *iface) { - FIXME("iface %p, stub!\n", iface); - return E_NOTIMPL; + struct ddraw_stream *stream = impl_from_IPin(iface); + + TRACE("stream %p.\n", stream); + + EnterCriticalSection(&stream->cs); + + stream->flushing = FALSE; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI ddraw_sink_NewSegment(IPin *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) @@ -1299,6 +1320,11 @@ static HRESULT WINAPI ddraw_meminput_Receive(IMemInputPin *iface, IMediaSample * LeaveCriticalSection(&stream->cs); return S_OK; } + if (stream->flushing) + { + LeaveCriticalSection(&stream->cs); + return S_FALSE; + } if (!list_empty(&stream->update_queue)) { struct ddraw_sample *sample = LIST_ENTRY(list_head(&stream->update_queue), struct ddraw_sample, entry); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index ef648252798..88f98a8b195 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4005,6 +4005,7 @@ static IPin *ammediastream_pin; static IMemInputPin *ammediastream_mem_input_pin; static IMediaSample *ammediastream_media_sample; static DWORD ammediastream_sleep_time; +static HRESULT ammediastream_expected_hr; static DWORD CALLBACK ammediastream_end_of_stream(void *param) { @@ -4012,7 +4013,7 @@ static DWORD CALLBACK ammediastream_end_of_stream(void *param) Sleep(ammediastream_sleep_time); hr = IPin_EndOfStream(ammediastream_pin); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == ammediastream_expected_hr, "Got hr %#x.\n", hr); return 0; } @@ -4023,7 +4024,7 @@ static DWORD CALLBACK ammediastream_receive(void *param) Sleep(ammediastream_sleep_time); hr = IMemInputPin_Receive(ammediastream_mem_input_pin, ammediastream_media_sample); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == ammediastream_expected_hr, "Got hr %#x.\n", hr); return 0; } @@ -4197,6 +4198,7 @@ static void test_audiostreamsample_update(void) ammediastream_mem_input_pin = mem_input_pin; ammediastream_media_sample = media_sample1; ammediastream_sleep_time = 100; + ammediastream_expected_hr = S_OK; thread = CreateThread(NULL, 0, ammediastream_receive, NULL, 0, NULL); hr = IAudioStreamSample_Update(stream_sample, 0, NULL, NULL, 0); @@ -4216,6 +4218,7 @@ static void test_audiostreamsample_update(void) ammediastream_pin = pin; ammediastream_sleep_time = 100; + ammediastream_expected_hr = S_OK; thread = CreateThread(NULL, 0, ammediastream_end_of_stream, NULL, 0, NULL); hr = IAudioStreamSample_Update(stream_sample, 0, NULL, NULL, 0); @@ -5157,6 +5160,7 @@ static void test_ddrawstream_receive(void) ammediastream_mem_input_pin = source.source.pMemInputPin; ammediastream_media_sample = sample; ammediastream_sleep_time = 0; + ammediastream_expected_hr = S_OK; thread = CreateThread(NULL, 0, ammediastream_receive, NULL, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Receive returned prematurely.\n"); @@ -5196,6 +5200,121 @@ static void test_ddrawstream_receive(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_ddrawstream_begin_flush_end_flush(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawStreamSample *stream_sample; + IDirectDrawMediaStream *ddraw_stream; + IMediaSample *media_sample; + IMediaFilter *media_filter; + struct testfilter source; + IGraphBuilder *graph; + IMediaStream *stream; + VIDEOINFO video_info; + AM_MEDIA_TYPE mt; + HANDLE thread; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + hr = IGraphBuilder_QueryInterface(graph, &IID_IMediaFilter, (void **)&media_filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + testfilter_init(&source); + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaFilter_SetSyncSource(media_filter, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + video_info = rgb32_video_info; + video_info.bmiHeader.biWidth = 3; + video_info.bmiHeader.biHeight = 1; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &stream_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ammediastream_mem_input_pin = source.source.pMemInputPin; + ammediastream_media_sample = media_sample; + ammediastream_sleep_time = 0; + ammediastream_expected_hr = S_FALSE; + thread = CreateThread(NULL, 0, ammediastream_receive, NULL, 0, NULL); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(!WaitForSingleObject(thread, 2000), "Wait timed out.\n"); + CloseHandle(thread); + + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IDirectDrawStreamSample_Update(stream_sample, SSUPDATE_ASYNC, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IGraphBuilder_Disconnect(graph, pin); + IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + + ref = IDirectDrawStreamSample_Release(stream_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaFilter_Release(media_filter); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void check_ammediastream_join_am_multi_media_stream(const CLSID *clsid) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -7062,6 +7181,7 @@ static void test_ddrawstreamsample_update(void) ammediastream_mem_input_pin = mem_input_pin; ammediastream_media_sample = media_sample; ammediastream_sleep_time = 0; + ammediastream_expected_hr = S_OK; thread = CreateThread(NULL, 0, ammediastream_receive, NULL, 0, NULL); Sleep(100); @@ -7109,6 +7229,7 @@ static void test_ddrawstreamsample_update(void) ammediastream_mem_input_pin = mem_input_pin; ammediastream_media_sample = media_sample; ammediastream_sleep_time = 0; + ammediastream_expected_hr = S_OK; thread = CreateThread(NULL, 0, ammediastream_receive, NULL, 0, NULL); Sleep(100); @@ -7161,6 +7282,7 @@ static void test_ddrawstreamsample_update(void) ammediastream_mem_input_pin = mem_input_pin; ammediastream_media_sample = media_sample; ammediastream_sleep_time = 100; + ammediastream_expected_hr = S_OK; thread = CreateThread(NULL, 0, ammediastream_receive, NULL, 0, NULL); hr = IDirectDrawStreamSample_Update(stream_sample, 0, NULL, NULL, 0); @@ -7183,6 +7305,7 @@ static void test_ddrawstreamsample_update(void) ammediastream_pin = pin; ammediastream_sleep_time = 100; + ammediastream_expected_hr = S_OK; thread = CreateThread(NULL, 0, ammediastream_end_of_stream, NULL, 0, NULL); hr = IDirectDrawStreamSample_Update(stream_sample, 0, NULL, NULL, 0); @@ -7714,6 +7837,7 @@ START_TEST(amstream) test_ddrawstream_get_format(); test_ddrawstream_set_format(); test_ddrawstream_receive(); + test_ddrawstream_begin_flush_end_flush(); test_ddrawstreamsample_get_media_stream(); test_ddrawstreamsample_update(); -- 2.17.1

2 3

[PATCH 4/4] include: Add IMFMetadataProvider interface in mfidl.idl.
by Biswapriyo Nath 06 Oct '20

06 Oct '20

2 1

[PATCH 3/4] include: Add IMFMetadata interface in mfidl.idl.
by Biswapriyo Nath 06 Oct '20

06 Oct '20

2 1

[PATCH 2/4] include: Fix CancelObjectCreation name in IMFSourceResolver interface.
by Biswapriyo Nath 06 Oct '20

06 Oct '20

2 1

[PATCH 1/4] include: Add MFPMPSESSION_CREATION_FLAGS enumeration in mfidl.idl.
by Biswapriyo Nath 06 Oct '20

06 Oct '20

2 1

[PATCH vkd3d v2] include: Add ID3D12InfoQueue interface in d3d12sdklayers.idl.
by Biswapriyo Nath 06 Oct '20

06 Oct '20

1 0

[PATCH vkd3d] include: Add ID3D12InfoQueue interface in d3d12sdklayers.idl.
by Biswapriyo Nath 06 Oct '20

06 Oct '20

1 1

[PATCH] vbscript/tests: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/tests/createobj.c | 4 +--- dlls/vbscript/tests/run.c | 28 +++++++++------------------- dlls/vbscript/tests/vbscript.c | 5 +---- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index 34a9def89d5..c0a653fb1ea 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -88,8 +88,6 @@ DEFINE_EXPECT(Caller_QS_SecMgr); DEFINE_EXPECT(QI_IObjectWithSite); DEFINE_EXPECT(SetSite); -static const WCHAR testW[] = {'t','e','s','t',0}; - static HRESULT QS_SecMgr_hres; static HRESULT ProcessUrlAction_hres; static DWORD ProcessUrlAction_policy; @@ -753,7 +751,7 @@ static IActiveScriptParse *create_script(BOOL use_sec_mgr) hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(script, testW, + hres = IActiveScript_AddNamedItem(script, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 6dcd13bf752..bb33e6576ea 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -155,9 +155,6 @@ DEFINE_EXPECT(OnLeaveScript); #define FACILITY_VBS 0xa #define MAKE_VBSERROR(code) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_VBS, code) -static const WCHAR testW[] = {'t','e','s','t',0}; -static const WCHAR emptyW[] = {0}; - static BOOL strict_dispid_check, is_english, allow_ui; static int first_day_of_week; static const char *test_name = "(null)"; @@ -1957,7 +1954,7 @@ static IActiveScript *create_and_init_script(DWORD flags, BOOL start) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|flags); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); @@ -2046,9 +2043,6 @@ static void test_parse_context(void) BSTR str; HRESULT hres; - static const WCHAR xW[] = {'x',0}; - static const WCHAR yW[] = {'y',0}; - global_ref = 1; engine = create_and_init_script(0, TRUE); if(!engine) @@ -2063,7 +2057,7 @@ static void test_parse_context(void) /* unknown identifier context is not a valid argument */ str = a2bstr("Call reportSuccess()\n"); - hres = IActiveScriptParse_ParseScriptText(parser, str, yW, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, str, L"y", NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == E_INVALIDARG, "ParseScriptText failed: %08x\n", hres); SysFreeString(str); @@ -2080,14 +2074,14 @@ static void test_parse_context(void) /* known global variable is not a valid context */ str = a2bstr("Call reportSuccess()\n"); - hres = IActiveScriptParse_ParseScriptText(parser, str, xW, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, str, L"x", NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == E_INVALIDARG, "ParseScriptText failed: %08x\n", hres); SysFreeString(str); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); str = a2bstr("Call reportSuccess()\n"); - hres = IActiveScriptParse_ParseScriptText(parser, str, testW, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, str, L"test", NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); SysFreeString(str); CHECK_CALLED(global_success_d); @@ -2109,10 +2103,8 @@ static void _parse_htmlscript_a(unsigned line, const char *src) BSTR tmp; HRESULT hres; - static const WCHAR script_delimW[] = {'<','/','S','C','R','I','P','T','>',0}; - tmp = a2bstr(src); - hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp, script_delimW); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp, L"</SCRIPT>"); SysFreeString(tmp); ok_(__FILE__,line)(hres == S_OK, "parse_script failed: %08x\n", hres); } @@ -2124,10 +2116,8 @@ static IDispatchEx *parse_procedure(IActiveScriptParseProcedure2 *parse_proc, co BSTR str; HRESULT hres; - static const WCHAR delimiterW[] = {'\"',0}; - str = a2bstr(src); - hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, str, NULL, emptyW, NULL, NULL, delimiterW, 0, 0, + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, str, NULL, L"", NULL, NULL, L"\"", 0, 0, SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS|flags, &disp); SysFreeString(str); ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); @@ -2158,7 +2148,7 @@ static void test_procedures(void) hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 iface: %08x\n", hres); - hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, NULL, NULL, emptyW, NULL, NULL, NULL, 0, 0, 0, &disp); + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, NULL, NULL, L"", NULL, NULL, NULL, 0, 0, 0, &disp); ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); IDispatch_Release(disp); @@ -2385,7 +2375,7 @@ static void test_gc(void) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); @@ -2643,7 +2633,7 @@ static HRESULT test_global_vars_ref(BOOL use_close) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 04e7545da2d..8e6f0995c59 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1500,9 +1500,6 @@ static void test_vbscript_uninitializing(void) ULONG ref; HRESULT hres; - static const WCHAR script_textW[] = - {'F','u','n','c','t','i','o','n',' ','f','\n','E','n','d',' ','F','u','n','c','t','i','o','n','\n',0}; - script = create_vbscript(); hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parse); @@ -1529,7 +1526,7 @@ static void test_vbscript_uninitializing(void) test_state(script, SCRIPTSTATE_INITIALIZED); - hres = IActiveScriptParse_ParseScriptText(parse, script_textW, NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parse, L"Function f\nEnd Function\n", NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); -- 2.26.2

2 1

[PATCH] vbscript: Avoid double frees on error path (Coverity).
by Sven Baars 06 Oct '20

06 Oct '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/vbscript/global.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 4b1c23b838c..18504a43b9a 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2423,7 +2423,6 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, } hres = SafeArrayAccessData(sa, (void**)&data); if(FAILED(hres)) { - SafeArrayDestroy(sa); goto error; } @@ -2440,7 +2439,6 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, hres = VariantCopyInd(data+i, &var); if(FAILED(hres)) { SafeArrayUnaccessData(sa); - SafeArrayDestroy(sa); goto error; } start = indices[i]+delimiterlen; @@ -2452,7 +2450,7 @@ error: V_VT(res) = VT_ARRAY|VT_VARIANT; V_ARRAY(res) = sa; }else { - if (sa) SafeArrayDestroy(sa); + SafeArrayDestroy(sa); } heap_free(indices); -- 2.25.1

2 2

[PATCH] vbscript: Implement redim preserve
by Kevin Puetz 06 Oct '20

06 Oct '20

Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- dlls/vbscript/compile.c | 14 +++++---- dlls/vbscript/interp.c | 57 ++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/lang.vbs | 56 +++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 4 files changed, 122 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 164c2d15cf..2e991b0c0a 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1128,16 +1128,18 @@ static HRESULT compile_redim_statement(compile_ctx_t *ctx, redim_statement_t *st unsigned arg_cnt; HRESULT hres; - if(stat->preserve) { - FIXME("Preserving redim not supported\n"); - return E_NOTIMPL; - } - hres = compile_args(ctx, stat->dims, &arg_cnt); if(FAILED(hres)) return hres; - return push_instr_bstr_uint(ctx, OP_redim, stat->identifier, arg_cnt); + hres = push_instr_bstr_uint(ctx, stat->preserve ? OP_redim_preserve : OP_redim, stat->identifier, arg_cnt); + if(FAILED(hres)) + return hres; + + if(!emit_catch(ctx, 0)) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT compile_const_statement(compile_ctx_t *ctx, const_statement_t *stat) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 342b7820ec..4f861ad5d8 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1291,6 +1291,63 @@ static HRESULT interp_redim(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_redim_preserve(exec_ctx_t *ctx) +{ + BSTR identifier = ctx->instr->arg1.bstr; + const unsigned dim_cnt = ctx->instr->arg2.uint; + unsigned i; + SAFEARRAYBOUND *bounds; + SAFEARRAY *array; + ref_t ref; + HRESULT hres; + + TRACE("%s %u\n", debugstr_w(identifier), dim_cnt); + + hres = lookup_identifier(ctx, identifier, VBDISP_LET, &ref); + if(FAILED(hres)) { + FIXME("lookup %s failed: %08x\n", debugstr_w(identifier), hres); + return hres; + } + + if(ref.type != REF_VAR) { + FIXME("got ref.type = %d\n", ref.type); + return E_FAIL; + } + + if(!(V_VT(ref.u.v) & VT_ARRAY)) { + FIXME("ReDim Preserve not valid on type %d\n", V_VT(ref.u.v)); + return E_FAIL; + } + + array = V_ARRAY(ref.u.v); + + hres = array_bounds_from_stack(ctx, dim_cnt, &bounds); + if(FAILED(hres)) + return hres; + + if(array == NULL || array->cDims == 0) { + /* can initially allocate the array */ + array = SafeArrayCreate(VT_VARIANT, dim_cnt, bounds); + VariantClear(ref.u.v); + V_VT(ref.u.v) = VT_ARRAY|VT_VARIANT; + V_ARRAY(ref.u.v) = array; + return S_OK; + } else if(array->cDims != dim_cnt) { + /* can't otherwise change the number of dimensions */ + TRACE("Can't resize %s, cDims %d != %d\n", debugstr_w(identifier), array->cDims, dim_cnt); + return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + } else { + /* can resize the last dimensions (if others match */ + for(i = 0; i+1 < dim_cnt; ++i) { + if(array->rgsabound[array->cDims - 1 - i].cElements != bounds[i].cElements) { + TRACE("Can't resize %s, bound[%d] %d != %d\n", debugstr_w(identifier), i, array->rgsabound[i].cElements, bounds[i].cElements); + return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + } + } + return SafeArrayRedim(array, &bounds[dim_cnt-1]); + } +} + static HRESULT interp_step(exec_ctx_t *ctx) { const BSTR ident = ctx->instr->arg2.bstr; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index dc16c50fae..fc762450a3 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1412,6 +1412,28 @@ x = 1 redim x(3) ok ubound(x) = 3, "ubound(x) = " & ubound(x) +x(0) = 1 +x(1) = 2 +x(2) = 3 +x(2) = 4 + +redim preserve x(1) +ok ubound(x) = 1, "ubound(x) = " & ubound(x) +ok x(0) = 1, "x(0) = " & x(1) +ok x(1) = 2, "x(1) = " & x(1) + +redim preserve x(2) +ok ubound(x) = 2, "ubound(x) = " & ubound(x) +ok x(0) = 1, "x(0) = " & x(0) +ok x(1) = 2, "x(1) = " & x(1) +ok x(2) = vbEmpty, "x(2) = " & x(2) + +on error resume next +redim preserve x(2,2) +e = err.number +on error goto 0 +ok e = 9, "e = " & e ' VBSE_OUT_OF_BOUNDS, cannot change cDims + x = Array(1, 2) redim x(-1) ok lbound(x) = 0, "lbound(x) = " & lbound(x) @@ -1422,6 +1444,40 @@ ok ubound(x) = 3, "ubound(x) = " & ubound(x) ok ubound(x, 1) = 3, "ubound(x, 1) = " & ubound(x, 1) ok ubound(x, 2) = 2, "ubound(x, 2) = " & ubound(x, 2) & " expected 2" +redim x(1, 3) +x(0,0) = 1.1 +x(0,1) = 1.2 +x(0,2) = 1.3 +x(0,3) = 1.4 +x(1,0) = 2.1 +x(1,1) = 2.2 +x(1,2) = 2.3 +x(1,3) = 2.4 + +redim preserve x(1,1) +ok ubound(x, 1) = 1, "ubound(x, 1) = " & ubound(x, 1) +ok ubound(x, 2) = 1, "ubound(x, 2) = " & ubound(x, 2) +ok x(0,0) = 1.1, "x(0,0) = " & x(0,0) +ok x(0,1) = 1.2, "x(0,1) = " & x(0,1) +ok x(1,0) = 2.1, "x(1,0) = " & x(1,0) +ok x(1,1) = 2.2, "x(1,1) = " & x(1,1) + +redim preserve x(1,2) +ok ubound(x, 1) = 1, "ubound(x, 1) = " & ubound(x, 1) +ok ubound(x, 2) = 2, "ubound(x, 2) = " & ubound(x, 2) +ok x(0,0) = 1.1, "x(0,0) = " & x(0,0) +ok x(0,1) = 1.2, "x(0,1) = " & x(0,1) +ok x(1,0) = 2.1, "x(1,0) = " & x(1,0) +ok x(1,1) = 2.2, "x(1,1) = " & x(1,1) +ok x(0,2) = vbEmpty, "x(0,2) = " & x(0,2) +ok x(1,2) = vbEmpty, "x(1,2) = " & x(1,1) + +on error resume next +redim preserve x(2,2) +e = err.number +on error goto 0 +ok e = 9, "e = " & e ' VBSE_OUT_OF_BOUNDS, can only change rightmost dimension + dim staticarray(4) on error resume next redim staticarray(3) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1edf7906af..869fb05b6e 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -265,6 +265,7 @@ typedef enum { X(or, 1, 0, 0) \ X(pop, 1, ARG_UINT, 0) \ X(redim, 1, ARG_BSTR, ARG_UINT) \ + X(redim_preserve, 1, ARG_BSTR, ARG_UINT) \ X(ret, 0, 0, 0) \ X(retval, 1, 0, 0) \ X(set_ident, 1, ARG_BSTR, ARG_UINT) \

2 1

[PATCH 1/3] wined3d: Use struct wined3d_swapchain_state for Alt+Enter hooking.
by Zhiyi Zhang 06 Oct '20

06 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 20 ++++--- dlls/dxgi/utils.c | 2 +- dlls/wined3d/swapchain.c | 4 -- dlls/wined3d/wined3d.spec | 2 + dlls/wined3d/wined3d_main.c | 99 +++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 - include/wine/wined3d.h | 8 +-- 8 files changed, 69 insertions(+), 69 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index e43ee59461c..906fe914cba 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -177,6 +177,7 @@ struct d3d11_swapchain LONG refcount; struct wined3d_private_store private_store; struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_state *state; IWineDXGIDevice *device; IDXGIFactory *factory; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f3b74389d29..9d6ec0246ce 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -249,6 +249,7 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_Release(IDXGISwapChain1 *iface) } if (swapchain->factory) IDXGIFactory_Release(swapchain->factory); + wined3d_swapchain_state_unregister(swapchain->state); wined3d_swapchain_decref(swapchain->wined3d_swapchain); if (device) IWineDXGIDevice_Release(device); @@ -388,7 +389,6 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); struct wined3d_swapchain_desc swapchain_desc; - struct wined3d_swapchain_state *state; struct dxgi_output *dxgi_output; HRESULT hr; @@ -412,11 +412,10 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen dxgi_output = unsafe_impl_from_IDXGIOutput(target); wined3d_mutex_lock(); - state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); swapchain_desc.output = dxgi_output->wined3d_output; swapchain_desc.windowed = !fullscreen; - hr = wined3d_swapchain_state_set_fullscreen(state, &swapchain_desc, NULL); + hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &swapchain_desc, NULL); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -556,13 +555,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i const DXGI_MODE_DESC *target_mode_desc) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - struct wined3d_swapchain_state *state; TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); - state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); - - return dxgi_swapchain_resize_target(state, target_mode_desc); + return dxgi_swapchain_resize_target(swapchain->state, target_mode_desc); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) @@ -814,6 +810,7 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc) { + struct wined3d *wined3d; BOOL fullscreen; HRESULT hr; @@ -856,13 +853,14 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi goto cleanup; } + swapchain->state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); + wined3d = wined3d_device_get_wined3d(device->wined3d_device); + wined3d_swapchain_state_register(swapchain->state, wined3d); + swapchain->target = NULL; if (fullscreen) { - struct wined3d_swapchain_state *state; - desc->windowed = FALSE; - state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(&swapchain->IDXGISwapChain1_iface, &swapchain->target))) @@ -872,7 +870,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi goto cleanup; } - if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(state, desc, NULL))) + if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, desc, NULL))) { WARN("Failed to set fullscreen state, hr %#x.\n", hr); IDXGIOutput_Release(swapchain->target); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 665413e4c62..0c83b912c6f 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -520,7 +520,7 @@ unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE dxgi_usage) #define DXGI_WINED3D_SWAPCHAIN_FLAGS \ (WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE | WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT \ - | WINED3D_SWAPCHAIN_HOOK | WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE) + | WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE) unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d0d93417a18..2cf36d189cb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -34,7 +34,6 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) TRACE("Destroying swapchain %p.\n", swapchain); - wined3d_unhook_swapchain(swapchain); wined3d_swapchain_set_gamma_ramp(swapchain, 0, &swapchain->orig_gamma); /* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0] @@ -1627,9 +1626,6 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct win desc, parent, parent_ops, &object))) return hr; - if (desc->flags & WINED3D_SWAPCHAIN_HOOK) - wined3d_hook_swapchain(object); - if (desc->flags & WINED3D_SWAPCHAIN_IMPLICIT) { wined3d_mutex_lock(); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d11e06d0c34..816108e8b3b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -292,8 +292,10 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_is_windowed(ptr) +@ cdecl wined3d_swapchain_state_register(ptr ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr) +@ cdecl wined3d_swapchain_state_unregister(ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) @ cdecl wined3d_texture_blt(ptr long ptr ptr long ptr long ptr long) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index c98aee18bdd..bb3ad7ffa51 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -56,25 +56,26 @@ struct wined3d_window_hook unsigned int count; }; -struct wined3d_hooked_swapchain +struct wined3d_registered_swapchain_state { - struct wined3d_swapchain *swapchain; + struct wined3d_swapchain_state *state; + struct wined3d *wined3d; DWORD thread_id; }; -struct wined3d_hook_table +struct wined3d_swapchain_state_table { struct wined3d_window_hook *hooks; SIZE_T hooks_size; SIZE_T hook_count; - struct wined3d_hooked_swapchain *swapchains; - SIZE_T swapchains_size; - SIZE_T swapchain_count; + struct wined3d_registered_swapchain_state *states; + SIZE_T states_size; + SIZE_T state_count; }; static struct wined3d_wndproc_table wndproc_table; -static struct wined3d_hook_table hook_table; +static struct wined3d_swapchain_state_table swapchain_state_table; static CRITICAL_SECTION wined3d_cs; static CRITICAL_SECTION_DEBUG wined3d_cs_debug = @@ -425,13 +426,13 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) } heap_free(wndproc_table.entries); - heap_free(hook_table.swapchains); - for (i = 0; i < hook_table.hook_count; ++i) + heap_free(swapchain_state_table.states); + for (i = 0; i < swapchain_state_table.hook_count; ++i) { - WARN("Leftover hook table entry %p.\n", &hook_table.hooks[i]); - UnhookWindowsHookEx(hook_table.hooks[i].hook); + WARN("Leftover swapchain state hook %p.\n", &swapchain_state_table.hooks[i]); + UnhookWindowsHookEx(swapchain_state_table.hooks[i].hook); } - heap_free(hook_table.hooks); + heap_free(swapchain_state_table.hooks); heap_free(wined3d_settings.logo); UnregisterClassA(WINED3D_OPENGL_WINDOW_CLASS_NAME, hInstDLL); @@ -573,8 +574,8 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam) { + struct wined3d_registered_swapchain_state *registered_state; struct wined3d_swapchain_desc swapchain_desc; - struct wined3d_swapchain *swapchain; struct wined3d_wndproc *entry; struct wined3d_output *output; MSG *msg = (MSG *)lparam; @@ -586,28 +587,28 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam { wined3d_wndproc_mutex_lock(); - for (i = 0; i < hook_table.swapchain_count; ++i) + for (i = 0; i < swapchain_state_table.state_count; ++i) { - swapchain = hook_table.swapchains[i].swapchain; + registered_state = &swapchain_state_table.states[i]; - if (swapchain->state.device_window != msg->hwnd) + if (registered_state->state->device_window != msg->hwnd) continue; - if ((entry = wined3d_find_wndproc(msg->hwnd, swapchain->device->wined3d)) + if ((entry = wined3d_find_wndproc(msg->hwnd, registered_state->wined3d)) && (entry->flags & (WINED3D_REGISTER_WINDOW_NO_WINDOW_CHANGES | WINED3D_REGISTER_WINDOW_NO_ALT_ENTER))) continue; - wined3d_swapchain_get_desc(swapchain, &swapchain_desc); + swapchain_desc = registered_state->state->desc; swapchain_desc.windowed = !swapchain_desc.windowed; - if (!(output = wined3d_get_output_from_window(swapchain->device->wined3d, - swapchain->state.device_window))) + if (!(output = wined3d_get_output_from_window(registered_state->wined3d, + registered_state->state->device_window))) { - ERR("Failed to get output from window %p.\n", swapchain->state.device_window); + ERR("Failed to get output from window %p.\n", registered_state->state->device_window); break; } swapchain_desc.output = output; - wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, NULL); + wined3d_swapchain_state_set_fullscreen(registered_state->state, &swapchain_desc, NULL); wined3d_wndproc_mutex_unlock(); @@ -764,82 +765,84 @@ static struct wined3d_window_hook *wined3d_find_hook(DWORD thread_id) { unsigned int i; - for (i = 0; i < hook_table.hook_count; ++i) + for (i = 0; i < swapchain_state_table.hook_count; ++i) { - if (hook_table.hooks[i].thread_id == thread_id) - return &hook_table.hooks[i]; + if (swapchain_state_table.hooks[i].thread_id == thread_id) + return &swapchain_state_table.hooks[i]; } return NULL; } -void wined3d_hook_swapchain(struct wined3d_swapchain *swapchain) +void CDECL wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, + struct wined3d *wined3d) { - struct wined3d_hooked_swapchain *swapchain_entry; + struct wined3d_registered_swapchain_state *state_entry; struct wined3d_window_hook *hook; wined3d_wndproc_mutex_lock(); - if (!wined3d_array_reserve((void **)&hook_table.swapchains, &hook_table.swapchains_size, - hook_table.swapchain_count + 1, sizeof(*swapchain_entry))) + if (!wined3d_array_reserve((void **)&swapchain_state_table.states, &swapchain_state_table.states_size, + swapchain_state_table.state_count + 1, sizeof(*state_entry))) { wined3d_wndproc_mutex_unlock(); return; } - swapchain_entry = &hook_table.swapchains[hook_table.swapchain_count++]; - swapchain_entry->swapchain = swapchain; - swapchain_entry->thread_id = GetWindowThreadProcessId(swapchain->state.device_window, NULL); + state_entry = &swapchain_state_table.states[swapchain_state_table.state_count++]; + state_entry->state = state; + state_entry->wined3d = wined3d; + state_entry->thread_id = GetWindowThreadProcessId(state->device_window, NULL); - if ((hook = wined3d_find_hook(swapchain_entry->thread_id))) + if ((hook = wined3d_find_hook(state_entry->thread_id))) { ++hook->count; wined3d_wndproc_mutex_unlock(); return; } - if (!wined3d_array_reserve((void **)&hook_table.hooks, &hook_table.hooks_size, - hook_table.hook_count + 1, sizeof(*hook))) + if (!wined3d_array_reserve((void **)&swapchain_state_table.hooks, &swapchain_state_table.hooks_size, + swapchain_state_table.hook_count + 1, sizeof(*hook))) { - --hook_table.swapchain_count; + --swapchain_state_table.state_count; wined3d_wndproc_mutex_unlock(); return; } - hook = &hook_table.hooks[hook_table.hook_count++]; - hook->thread_id = swapchain_entry->thread_id; + hook = &swapchain_state_table.hooks[swapchain_state_table.hook_count++]; + hook->thread_id = state_entry->thread_id; hook->hook = SetWindowsHookExW(WH_GETMESSAGE, wined3d_hook_proc, 0, hook->thread_id); hook->count = 1; wined3d_wndproc_mutex_unlock(); } -void wined3d_unhook_swapchain(struct wined3d_swapchain *swapchain) +void CDECL wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) { - struct wined3d_hooked_swapchain *swapchain_entry, *last_swapchain_entry; + struct wined3d_registered_swapchain_state *state_entry, *last_state_entry; struct wined3d_window_hook *hook, *last_hook; unsigned int i; wined3d_wndproc_mutex_lock(); - for (i = 0; i < hook_table.swapchain_count; ++i) + for (i = 0; i < swapchain_state_table.state_count; ++i) { - swapchain_entry = &hook_table.swapchains[i]; + state_entry = &swapchain_state_table.states[i]; - if (swapchain_entry->swapchain != swapchain) + if (state_entry->state != state) continue; - if ((hook = wined3d_find_hook(swapchain_entry->thread_id)) && !--hook->count) + if ((hook = wined3d_find_hook(state_entry->thread_id)) && !--hook->count) { UnhookWindowsHookEx(hook->hook); - last_hook = &hook_table.hooks[--hook_table.hook_count]; + last_hook = &swapchain_state_table.hooks[--swapchain_state_table.hook_count]; if (hook != last_hook) *hook = *last_hook; } - last_swapchain_entry = &hook_table.swapchains[--hook_table.swapchain_count]; - if (swapchain_entry != last_swapchain_entry) - *swapchain_entry = *last_swapchain_entry; + last_state_entry = &swapchain_state_table.states[--swapchain_state_table.state_count]; + if (state_entry != last_state_entry) + *state_entry = *last_state_entry; break; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1c783d28bc2..7c88e04f5e7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3514,9 +3514,7 @@ struct wined3d }; BOOL wined3d_filter_messages(HWND window, BOOL filter) DECLSPEC_HIDDEN; -void wined3d_hook_swapchain(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; -void wined3d_unhook_swapchain(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 238961006a0..3f2361e55a5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -904,9 +904,8 @@ enum wined3d_shader_type #define WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT 0x00004000u #define WINED3D_SWAPCHAIN_GDI_COMPATIBLE 0x00008000u #define WINED3D_SWAPCHAIN_IMPLICIT 0x00010000u -#define WINED3D_SWAPCHAIN_HOOK 0x00020000u -#define WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES 0x00040000u -#define WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE 0x00080000u +#define WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES 0x00020000u +#define WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE 0x00040000u #define WINED3DDP_MAXTEXCOORD 8 @@ -2807,10 +2806,13 @@ HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_de HWND window, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); BOOL __cdecl wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state); +void __cdecl wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, + struct wined3d *wined3d); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode); +void __cdecl wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); -- 2.25.1

1 0

[PATCH] server: Remove leftover dump in key_get_full_name().
by Paul Gofman 06 Oct '20

06 Oct '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- server/registry.c | 1 - 1 file changed, 1 deletion(-) diff --git a/server/registry.c b/server/registry.c index c4451f3901d..e13f2a18645 100644 --- a/server/registry.c +++ b/server/registry.c @@ -410,7 +410,6 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) for (key = (struct key *)obj; key != root_key; key = key->parent) { memcpy( ret + len - key->namelen, key->name, key->namelen ); - dump_strW( (WCHAR *)(ret + len - key->namelen), key->namelen, stderr, "" ); len -= key->namelen + sizeof(WCHAR); memcpy( ret + len, &backslash, sizeof(WCHAR) ); } -- 2.26.2

1 0

[PATCH] include/audiosessiontypes.h: Add a few more stream categories
by Andrew Eikum 06 Oct '20

06 Oct '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- include/audiosessiontypes.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/audiosessiontypes.h b/include/audiosessiontypes.h index 81c65265759..81383199010 100644 --- a/include/audiosessiontypes.h +++ b/include/audiosessiontypes.h @@ -56,7 +56,11 @@ typedef enum _AUDIO_STREAM_CATEGORY AudioCategory_Alerts, AudioCategory_SoundEffects, AudioCategory_GameEffects, - AudioCategory_GameMedia + AudioCategory_GameMedia, + AudioCategory_GameChat, + AudioCategory_Speech, + AudioCategory_Movie, + AudioCategory_Media, } AUDIO_STREAM_CATEGORY; #endif -- 2.28.0

1 0

[PATCH] server: Check reply size when copying key full name.
by Paul Gofman 06 Oct '20

06 Oct '20

Fixes segfault in wineserver during ntdll reg test. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- server/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/registry.c b/server/registry.c index 3b2d59fc725..c4451f3901d 100644 --- a/server/registry.c +++ b/server/registry.c @@ -978,7 +978,7 @@ static void enum_key( struct key *key, int index, int info_class, struct enum_ke else if (info_class == KeyNameInformation) { reply->namelen = namelen; - memcpy( data, fullname, namelen ); + memcpy( data, fullname, min( len, namelen )); } else { -- 2.26.2

1 0

[PATCH 1/5] evr/presenter: Return default flags for GetRenderingPrefs().
by Nikolay Sivov 06 Oct '20

06 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 14 ++++++++++++-- dlls/evr/tests/evr.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index eceabfd381d..8c455778d77 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -61,6 +61,7 @@ struct video_presenter HWND video_window; MFVideoNormalizedRect src_rect; RECT dst_rect; + DWORD rendering_prefs; unsigned int state; CRITICAL_SECTION cs; }; @@ -658,9 +659,18 @@ static HRESULT WINAPI video_presenter_control_SetRenderingPrefs(IMFVideoDisplayC static HRESULT WINAPI video_presenter_control_GetRenderingPrefs(IMFVideoDisplayControl *iface, DWORD *flags) { - FIXME("%p, %p.\n", iface, flags); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, flags); + + if (!flags) + return E_POINTER; + + EnterCriticalSection(&presenter->cs); + *flags = presenter->rendering_prefs; + LeaveCriticalSection(&presenter->cs); + + return S_OK; } static HRESULT WINAPI video_presenter_control_SetFullscreen(IMFVideoDisplayControl *iface, BOOL fullscreen) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index db9546a945b..85eedbe6643 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -979,6 +979,7 @@ static void test_default_presenter(void) HWND hwnd, hwnd2; HANDLE handle; IUnknown *unk; + DWORD flags; float rate; HRESULT hr; GUID iid; @@ -1016,6 +1017,15 @@ static void test_default_presenter(void) hr = IMFGetService_GetService(gs, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetRenderingPrefs(display_control, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + flags = 123; + hr = IMFVideoDisplayControl_GetRenderingPrefs(display_control, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!flags, "Unexpected rendering flags %#x.\n", flags); + IMFVideoDisplayControl_Release(display_control); hr = IMFGetService_GetService(gs, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); -- 2.28.0

1 4

[PATCH 1/2] ntdll: Clear ExceptionFlags on arm64 after running an exception handler
by Martin Storsjo 06 Oct '20

06 Oct '20

This applies the beahviour from a69762541a18107fbd8e9fb8362c3af8ddf1d90b (on x86_64) to arm64 as well. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- This fixes one aspect of https://github.com/microsoft/compiler-tests/blob/master/seh/seh0027.c on arm64. --- dlls/ntdll/signal_arm64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c9f44e92d30..cc620eb1b46 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -341,6 +341,7 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); + rec->ExceptionFlags &= EH_NONCONTINUABLE; __wine_pop_frame( &frame ); return res; } -- 2.17.1

2 3

[PATCH 5/5] bcrypt: Add support for importing legacy DSA public keys.
by Hans Leidekker 06 Oct '20

06 Oct '20

This is not supported on native but it will be useful to implement public key import in dssenh. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 28 +++++++++++++++++++++ dlls/bcrypt/gnutls.c | 53 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index bc6ec69918..a91f31e9f0 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1329,6 +1329,34 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP *ret_key = key; return STATUS_SUCCESS; } + else if (!wcscmp( type, LEGACY_DSA_V2_PUBLIC_BLOB )) /* not supported on native */ + { + BLOBHEADER *hdr = (BLOBHEADER *)input; + DSSPUBKEY *pubkey; + ULONG size; + + if (alg->id != ALG_ID_DSA) return STATUS_NOT_SUPPORTED; + if (input_len < sizeof(*hdr)) return STATUS_INVALID_PARAMETER; + + if (hdr->bType != PUBLICKEYBLOB && hdr->bVersion != 2 && hdr->aiKeyAlg != CALG_DSS_SIGN) + { + FIXME( "blob type %u version %u alg id %u not supported\n", hdr->bType, hdr->bVersion, hdr->aiKeyAlg ); + return STATUS_NOT_SUPPORTED; + } + + if (input_len < sizeof(*hdr) + sizeof(*pubkey)) return STATUS_INVALID_PARAMETER; + pubkey = (DSSPUBKEY *)(hdr + 1); + if (pubkey->magic != MAGIC_DSS1) return STATUS_NOT_SUPPORTED; + + size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); + if (input_len < size) return STATUS_INVALID_PARAMETER; + + if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, (BYTE *)hdr, size ))) return status; + key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; + + *ret_key = key; + return STATUS_SUCCESS; + } FIXME( "unsupported key type %s\n", debugstr_w(type) ); return STATUS_NOT_SUPPORTED; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 2d80b74aac..94e375cc8c 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1336,6 +1336,54 @@ static NTSTATUS import_gnutls_pubkey_dsa( struct key *key, gnutls_pubkey_t *gnut return STATUS_SUCCESS; } +static NTSTATUS import_gnutls_pubkey_dsa_capi( struct key *key, gnutls_pubkey_t *gnutls_key ) +{ + BLOBHEADER *hdr; + DSSPUBKEY *pubkey; + gnutls_datum_t p, q, g, y; + unsigned char *data, p_data[128], q_data[20], g_data[128], y_data[128]; + int i, ret, size; + + if ((ret = pgnutls_pubkey_init( gnutls_key ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + hdr = (BLOBHEADER *)key->u.a.pubkey; + pubkey = (DSSPUBKEY *)(hdr + 1); + size = pubkey->bitlen / 8; + data = (unsigned char *)(pubkey + 1); + + p.data = p_data; + p.size = size; + for (i = 0; i < p.size; i++) p.data[i] = data[p.size - i - 1]; + data += p.size; + + q.data = q_data; + q.size = sizeof(q_data); + for (i = 0; i < q.size; i++) q.data[i] = data[q.size - i - 1]; + data += q.size; + + g.data = g_data; + g.size = size; + for (i = 0; i < g.size; i++) g.data[i] = data[g.size - i - 1]; + data += g.size; + + y.data = y_data; + y.size = sizeof(y_data); + for (i = 0; i < y.size; i++) y.data[i] = data[y.size - i - 1]; + + if ((ret = pgnutls_pubkey_import_dsa_raw( *gnutls_key, &p, &q, &g, &y ))) + { + pgnutls_perror( ret ); + pgnutls_pubkey_deinit( *gnutls_key ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_key ) { switch (key->alg_id) @@ -1349,7 +1397,10 @@ static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_k return import_gnutls_pubkey_rsa( key, gnutls_key ); case ALG_ID_DSA: - return import_gnutls_pubkey_dsa( key, gnutls_key ); + if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2) + return import_gnutls_pubkey_dsa_capi( key, gnutls_key ); + else + return import_gnutls_pubkey_dsa( key, gnutls_key ); default: FIXME("algorithm %u not yet supported\n", key->alg_id ); -- 2.28.0

1 0

[PATCH 4/5] bcrypt: Add support for exporting legacy DSA public keys.
by Hans Leidekker 06 Oct '20

06 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 4 ++ dlls/bcrypt/bcrypt_main.c | 2 +- dlls/bcrypt/gnutls.c | 93 +++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 5edc9e6c9c..13d6ba8d6c 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -27,6 +27,7 @@ #include "wincrypt.h" #include "bcrypt.h" +#define MAGIC_DSS1 ('D' | ('S' << 8) | ('S' << 16) | ('1' << 24)) #define MAGIC_DSS2 ('D' | ('S' << 8) | ('S' << 16) | ('2' << 24)) typedef struct @@ -164,9 +165,12 @@ struct key_symmetric ULONG secret_len; }; +#define KEY_FLAG_LEGACY_DSA_V2 0x00000001 + struct key_asymmetric { ULONG bitlen; /* ignored for ECC keys */ + ULONG flags; UCHAR *pubkey; ULONG pubkey_len; DSSSEED dss_seed; diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 7f8b08869d..bc6ec69918 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -991,7 +991,7 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB ) || - !wcscmp( type, BCRYPT_ECCPUBLIC_BLOB )) + !wcscmp( type, BCRYPT_ECCPUBLIC_BLOB ) || !wcscmp( type, LEGACY_DSA_V2_PUBLIC_BLOB )) { *size = key->u.a.pubkey_len; if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index ed632dfd4c..2d80b74aac 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -804,6 +804,89 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit return STATUS_SUCCESS; } +static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, const DSSSEED *seed, ULONG bitlen, + UCHAR **pubkey, ULONG *pubkey_len ) +{ + BLOBHEADER *hdr; + DSSPUBKEY *dsskey; + gnutls_datum_t p, q, g, y; + UCHAR *dst, *src; + int i, ret, size = sizeof(*hdr) + sizeof(*dsskey) + sizeof(*seed); + + if (bitlen > 1024) + { + FIXME( "bitlen > 1024 not supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + if ((ret = pgnutls_privkey_export_dsa_raw( gnutls_key, &p, &q, &g, &y, NULL ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + if (!(hdr = RtlAllocateHeap( GetProcessHeap(), 0, size + p.size + q.size + g.size + y.size ))) + { + pgnutls_perror( ret ); + free( p.data ); free( q.data ); free( g.data ); free( y.data ); + return STATUS_NO_MEMORY; + } + + hdr->bType = PUBLICKEYBLOB; + hdr->bVersion = 2; + hdr->reserved = 0; + hdr->aiKeyAlg = CALG_DSS_SIGN; + + dsskey = (DSSPUBKEY *)(hdr + 1); + dsskey->magic = MAGIC_DSS1; + dsskey->bitlen = bitlen; + + dst = (UCHAR *)(dsskey + 1); + if (p.size % 2) + { + src = p.data + 1; + p.size--; + } + else src = p.data; + for (i = 0; i < p.size; i++) dst[i] = src[p.size - i - 1]; + + dst += p.size; + if (q.size % 2) + { + src = q.data + 1; + q.size--; + } + else src = q.data; + for (i = 0; i < q.size; i++) dst[i] = src[q.size - i - 1]; + + dst += q.size; + if (g.size % 2) + { + src = g.data + 1; + g.size--; + } + else src = g.data; + for (i = 0; i < g.size; i++) dst[i] = src[g.size - i - 1]; + + dst += g.size; + if (y.size % 2) + { + src = y.data + 1; + y.size--; + } + else src = y.data; + for (i = 0; i < y.size; i++) dst[i] = src[y.size - i - 1]; + + dst += y.size; + memcpy( dst, seed, sizeof(*seed) ); + + *pubkey = (UCHAR *)hdr; + *pubkey_len = size + p.size + q.size + g.size + y.size; + + free( p.data ); free( q.data ); free( g.data ); free( y.data ); + return STATUS_SUCCESS; +} + static NTSTATUS CDECL key_asymmetric_generate( struct key *key ) { gnutls_pk_algorithm_t pk_alg; @@ -1069,6 +1152,7 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le unsigned char dummy[128]; unsigned char *data, p_data[128], q_data[20], g_data[128], x_data[20]; int i, ret, size; + NTSTATUS status; if ((ret = pgnutls_privkey_init( &handle ))) { @@ -1118,9 +1202,18 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le return STATUS_INTERNAL_ERROR; } + if ((status = export_gnutls_pubkey_dsa_capi( handle, &key->u.a.dss_seed, key->u.a.bitlen, &key->u.a.pubkey, + &key->u.a.pubkey_len ))) + { + pgnutls_privkey_deinit( handle ); + return status; + } + memcpy( &key->u.a.dss_seed, data, sizeof(key->u.a.dss_seed) ); + key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; key_data(key)->privkey = handle; + return STATUS_SUCCESS; } -- 2.28.0

1 0

[PATCH 3/5] bcrypt: Convert legacy DSA key parameters to and from little-endian format.
by Hans Leidekker 06 Oct '20

06 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 54 +++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index be1a28e472..ed632dfd4c 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1003,7 +1003,7 @@ static NTSTATUS CDECL key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG le DSSPUBKEY *pubkey; gnutls_datum_t p, q, g, y, x; UCHAR *src, *dst; - int ret, size; + int i, ret, size; if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->privkey, &p, &q, &g, &y, &x ))) { @@ -1033,24 +1033,24 @@ static NTSTATUS CDECL key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG le pubkey->bitlen = key->u.a.bitlen; dst = (UCHAR *)(pubkey + 1); - if (p.size == size + 1) src = p.data + 1; + if (p.size % 2) src = p.data + 1; else src = p.data; - memcpy( dst, src, size ); + for (i = 0; i < size; i++) dst[i] = src[size - i - 1]; dst += size; - if (q.size == 21) src = q.data + 1; + if (q.size % 2) src = q.data + 1; else src = q.data; - memcpy( dst, src, 20 ); + for (i = 0; i < 20; i++) dst[i] = src[20 - i - 1]; dst += 20; - if (g.size == size + 1) src = g.data + 1; + if (g.size % 2) src = g.data + 1; else src = g.data; - memcpy( dst, src, size ); + for (i = 0; i < size; i++) dst[i] = src[size - i - 1]; dst += size; - if (x.size == 21) src = x.data + 1; + if (x.size % 2) src = x.data + 1; else src = x.data; - memcpy( dst, src, 20 ); + for (i = 0; i < 20; i++) dst[i] = src[20 - i - 1]; dst += 20; memcpy( dst, &key->u.a.dss_seed, sizeof(key->u.a.dss_seed) ); @@ -1067,7 +1067,8 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le gnutls_privkey_t handle; gnutls_datum_t p, q, g, y, x; unsigned char dummy[128]; - int ret, size; + unsigned char *data, p_data[128], q_data[20], g_data[128], x_data[20]; + int i, ret, size; if ((ret = pgnutls_privkey_init( &handle ))) { @@ -1077,16 +1078,33 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le hdr = (BLOBHEADER *)buf; pubkey = (DSSPUBKEY *)(hdr + 1); - size = pubkey->bitlen / 8; + if ((size = pubkey->bitlen / 8) > sizeof(p_data)) + { + FIXME( "size %u not supported\n", size ); + pgnutls_privkey_deinit( handle ); + return STATUS_NOT_SUPPORTED; + } + data = (unsigned char *)(pubkey + 1); - p.data = (unsigned char *)(pubkey + 1); + p.data = p_data; p.size = size; - q.data = p.data + size; - q.size = 20; - g.data = q.data + 20; + for (i = 0; i < p.size; i++) p.data[i] = data[p.size - i - 1]; + data += p.size; + + q.data = q_data; + q.size = sizeof(q_data); + for (i = 0; i < q.size; i++) q.data[i] = data[q.size - i - 1]; + data += q.size; + + g.data = g_data; g.size = size; - x.data = g.data + size; - x.size = 20; + for (i = 0; i < g.size; i++) g.data[i] = data[g.size - i - 1]; + data += g.size; + + x.data = x_data; + x.size = sizeof(x_data); + for (i = 0; i < x.size; i++) x.data[i] = data[x.size - i - 1]; + data += x.size; WARN( "using dummy public key\n" ); memset( dummy, 1, sizeof(dummy) ); @@ -1100,7 +1118,7 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le return STATUS_INTERNAL_ERROR; } - memcpy( &key->u.a.dss_seed, x.data + x.size, sizeof(key->u.a.dss_seed) ); + memcpy( &key->u.a.dss_seed, data, sizeof(key->u.a.dss_seed) ); key_data(key)->privkey = handle; return STATUS_SUCCESS; -- 2.28.0

1 0

[PATCH 2/5] bcrypt: Fix buffer size query in BCryptExportKey.
by Hans Leidekker 06 Oct '20

06 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 16c68ed691..7f8b08869d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -968,11 +968,13 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U *size = req_size; if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; - - header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; - header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; - header->cbKeyData = key->u.s.secret_len; - memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); + if (output) + { + header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; + header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; + header->cbKeyData = key->u.s.secret_len; + memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); + } return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_OPAQUE_KEY_BLOB )) @@ -981,9 +983,11 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U *size = req_size; if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; - - *(ULONG *)output = key->u.s.secret_len; - memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); + if (output) + { + *(ULONG *)output = key->u.s.secret_len; + memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); + } return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB ) || @@ -991,8 +995,7 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U { *size = key->u.a.pubkey_len; if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS; - - memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len ); + if (output) memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len ); return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB )) -- 2.28.0

1 0

[PATCH 1/5] bcrypt: Fix buffer size query in BCryptSignHash.
by Hans Leidekker 06 Oct '20

06 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 21520bb4a8..be1a28e472 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1415,9 +1415,9 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat case ALG_ID_RSA: case ALG_ID_RSA_SIGN: { - if (output_len < signature.size) return STATUS_BUFFER_TOO_SMALL; - memcpy( output, signature.data, signature.size ); *ret_len = signature.size; + if (output_len < signature.size) return STATUS_BUFFER_TOO_SMALL; + if (output) memcpy( output, signature.data, signature.size ); return STATUS_SUCCESS; } case ALG_ID_ECDSA_P256: @@ -1435,6 +1435,7 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat return STATUS_INTERNAL_ERROR; } + *ret_len = sig_len; if (output_len < sig_len) return STATUS_BUFFER_TOO_SMALL; if (r.size % 2) /* remove prepended zero byte */ @@ -1457,14 +1458,16 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat return STATUS_INTERNAL_ERROR; } - pad_size_r = (sig_len / 2) - r.size; - pad_size_s = (sig_len / 2) - s.size; - memset( output, 0, sig_len ); + if (output) + { + pad_size_r = (sig_len / 2) - r.size; + pad_size_s = (sig_len / 2) - s.size; + memset( output, 0, sig_len ); - memcpy( output + pad_size_r, r_data, r.size ); - memcpy( output + (sig_len / 2) + pad_size_s, s_data, s.size ); + memcpy( output + pad_size_r, r_data, r.size ); + memcpy( output + (sig_len / 2) + pad_size_s, s_data, s.size ); + } - *ret_len = sig_len; free( r.data ); free( s.data ); return STATUS_SUCCESS; } -- 2.28.0

1 0

[PATCH 1/2] ucrtbase: Add wcstold()/_wcstold_l().
by Nikolay Sivov 06 Oct '20

06 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- .../api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- .../api-ms-win-crt-private-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index d662921d028..ab5128e5004 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -56,7 +56,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) ucrtbase._wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) ucrtbase._wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) ucrtbase._wcstold_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) ucrtbase._wcstoll_l @ cdecl _wcstombs_l(ptr ptr long ptr) ucrtbase._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) ucrtbase._wcstombs_s_l @@ -109,7 +109,7 @@ @ cdecl wcstof(ptr ptr) ucrtbase.wcstof @ stub wcstoimax @ cdecl wcstol(wstr ptr long) ucrtbase.wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) ucrtbase.wcstold @ cdecl -ret64 wcstoll(wstr ptr long) ucrtbase.wcstoll @ cdecl wcstombs(ptr ptr long) ucrtbase.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) ucrtbase.wcstombs_s diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 4dd07406db3..1a31ac536cc 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -799,7 +799,7 @@ @ cdecl -ret64 _o__wcstoi64(wstr ptr long) ucrtbase._o__wcstoi64 @ cdecl -ret64 _o__wcstoi64_l(wstr ptr long ptr) ucrtbase._o__wcstoi64_l @ cdecl _o__wcstol_l(wstr ptr long ptr) ucrtbase._o__wcstol_l -@ stub _o__wcstold_l +@ cdecl _o__wcstold_l(wstr ptr ptr) ucrtbase._o__wcstold_l @ cdecl -ret64 _o__wcstoll_l(wstr ptr long ptr) ucrtbase._o__wcstoll_l @ cdecl _o__wcstombs_l(ptr ptr long ptr) ucrtbase._o__wcstombs_l @ cdecl _o__wcstombs_s_l(ptr ptr long wstr long ptr) ucrtbase._o__wcstombs_s_l @@ -1163,7 +1163,7 @@ @ cdecl _o_wcstok(wstr wstr ptr) ucrtbase._o_wcstok @ cdecl _o_wcstok_s(ptr wstr ptr) ucrtbase._o_wcstok_s @ cdecl _o_wcstol(wstr ptr long) ucrtbase._o_wcstol -@ stub _o_wcstold +@ cdecl _o_wcstold(wstr ptr ptr) ucrtbase._o_wcstold @ cdecl -ret64 _o_wcstoll(wstr ptr long) ucrtbase._o_wcstoll @ cdecl _o_wcstombs(ptr ptr long) ucrtbase._o_wcstombs @ cdecl _o_wcstombs_s(ptr ptr long wstr long) ucrtbase._o_wcstombs_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4c944a9d213..fda4bb69038 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1893,7 +1893,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @@ -2475,7 +2475,7 @@ @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) MSVCRT_wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) MSVCRT_wcstod @ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 9d292ccef5a..d0d5da63063 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1586,7 +1586,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcr120._wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) msvcr120._wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) msvcr120._wcstold_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) msvcr120._wcstoll_l @ cdecl _wcstombs_l(ptr ptr long ptr) msvcr120._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcr120._wcstombs_s_l @@ -2137,7 +2137,7 @@ @ cdecl wcstok(wstr wstr) msvcr120.wcstok @ cdecl wcstok_s(ptr wstr ptr) msvcr120.wcstok_s @ cdecl wcstol(wstr ptr long) msvcr120.wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) msvcr120.wcstold @ cdecl -ret64 wcstoll(wstr ptr long) msvcr120.wcstoll @ cdecl wcstombs(ptr ptr long) msvcr120.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) msvcr120.wcstombs_s diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 468d8dbb5ab..16409de9f73 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1463,7 +1463,7 @@ @ cdecl -ret64 _o__wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _o__wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _o__wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l -@ stub _o__wcstold_l +@ cdecl _o__wcstold_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _o__wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _o__wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _o__wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @@ -1828,7 +1828,7 @@ @ cdecl _o_wcstok(wstr wstr ptr) MSVCRT_wcstok @ cdecl _o_wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl _o_wcstol(wstr ptr long) MSVCRT_wcstol -@ stub _o_wcstold +@ cdecl _o_wcstold(wstr ptr ptr) MSVCRT_wcstod @ cdecl -ret64 _o_wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl _o_wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl _o_wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @@ -2042,7 +2042,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @@ -2582,7 +2582,7 @@ @ cdecl wcstok(wstr wstr ptr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) MSVCRT_wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) MSVCRT_wcstod @ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s -- 2.28.0

2 3

[PATCH] include: Add more SCARD defines
by Alistair Leslie-Hughes 06 Oct '20

06 Oct '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/winscard.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/winscard.h b/include/winscard.h index fc729e274cd..5aee1b3e548 100644 --- a/include/winscard.h +++ b/include/winscard.h @@ -66,6 +66,24 @@ DECL_WINELIB_TYPE_AW(SCARD_READERSTATE) DECL_WINELIB_TYPE_AW(PSCARD_READERSTATE) DECL_WINELIB_TYPE_AW(LPSCARD_READERSTATE) +#define SCARD_AUTOALLOCATE (DWORD)(-1) + +#define SCARD_SCOPE_USER 0 +#define SCARD_SCOPE_TERMINAL 1 +#define SCARD_SCOPE_SYSTEM 2 + +#define SCARD_STATE_UNAWARE 0x00000000 +#define SCARD_STATE_IGNORE 0x00000001 +#define SCARD_STATE_CHANGED 0x00000002 +#define SCARD_STATE_UNKNOWN 0x00000004 +#define SCARD_STATE_UNAVAILABLE 0x00000008 +#define SCARD_STATE_EMPTY 0x00000010 +#define SCARD_STATE_PRESENT 0x00000020 +#define SCARD_STATE_ATRMATCH 0x00000040 +#define SCARD_STATE_EXCLUSIVE 0x00000080 +#define SCARD_STATE_INUSE 0x00000100 +#define SCARD_STATE_MUTE 0x00000200 +#define SCARD_STATE_UNPOWERED 0x00000400 #ifdef __cplusplus extern "C" { -- 2.28.0

1 0

[PATCH] comctl32/tests: Remove skips from DPA tests.
by Nikolay Sivov 06 Oct '20

06 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/dpa.c | 42 ++------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 2a5eb503d9f..cbe3ab7fb2b 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -356,12 +356,6 @@ static void test_DPA_Merge(void) DWORD dw; BOOL rc; - if(!pDPA_Merge) - { - win_skip("DPA_Merge() not available\n"); - return; - } - dpa = pDPA_Create(0); dpa2 = pDPA_Create(0); dpa3 = pDPA_Create(0); @@ -485,12 +479,6 @@ static void test_DPA_EnumCallback(void) DWORD dw; INT i, ret; - if(!pDPA_EnumCallback) - { - win_skip("DPA_EnumCallback() not available\n"); - return; - } - dpa = pDPA_Create(0); for (i = 0; i < 6; i++) @@ -517,12 +505,6 @@ static void test_DPA_DestroyCallback(void) HDPA dpa; INT i, ret; - if(!pDPA_DestroyCallback) - { - win_skip("DPA_DestroyCallback() not available\n"); - return; - } - dpa = pDPA_Create(0); for (i = 0; i < 3; i++) @@ -548,18 +530,8 @@ static void test_DPA_LoadStream(void) ULONG written, ret; HDPA dpa; - if(!pDPA_LoadStream) - { - win_skip("DPA_LoadStream() not available. Skipping stream tests.\n"); - return; - } - hRes = CoInitialize(NULL); - if (hRes != S_OK) - { - ok(0, "hResult: %d\n", hRes); - return; - } + ok(hRes == S_OK, "Failed to initialize COM, hr %#x.\n", hRes); dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE; hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg); @@ -666,18 +638,8 @@ static void test_DPA_SaveStream(void) BOOL rc; LARGE_INTEGER liZero; - if(!pDPA_SaveStream) - { - win_skip("DPA_SaveStream() not available. Skipping stream tests.\n"); - return; - } - hRes = CoInitialize(NULL); - if (hRes != S_OK) - { - ok(0, "hResult: %d\n", hRes); - return; - } + ok(hRes == S_OK, "Failed to initialize COM, hr %#x.\n", hRes); dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE; hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg); -- 2.28.0

1 0

[PATCH] msxml3/tests: Use wide string literals in tests.
by Nikolay Sivov 06 Oct '20

06 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/domdoc.c | 263 +++++++++++++------------------------ 1 file changed, 90 insertions(+), 173 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 304c08acf6a..c19dd6c430e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -733,21 +733,11 @@ static void _expect_parse_error(IXMLDOMDocument *doc, HRESULT hr_exp, BOOL hr_to IXMLDOMParseError_Release(error); } -static const WCHAR szEmpty[] = { 0 }; -static const WCHAR szIncomplete[] = { - '<','?','x','m','l',' ', - 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n',0 -}; static const WCHAR szComplete1[] = { '<','?','x','m','l',' ', 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 }; -static const WCHAR szComplete2[] = { - '<','?','x','m','l',' ', - 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', - '<','a','>','<','/','a','>','\n',0 -}; static const char complete4A[] = "<?xml version=\'1.0\'?>\n" "<lc dl=\'str1\'>\n" @@ -765,25 +755,9 @@ static const char complete4A[] = "</fo>\n" "</lc>\n"; -static const WCHAR szComplete5[] = { - '<','S',':','s','e','a','r','c','h',' ','x','m','l','n','s',':','D','=','"','D','A','V',':','"',' ', - 'x','m','l','n','s',':','C','=','"','u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','o','f','f','i','c','e',':','c','l','i','p','g','a','l','l','e','r','y','"', - ' ','x','m','l','n','s',':','S','=','"','u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','o','f','f','i','c','e',':','c','l','i','p','g','a','l','l','e','r','y',':','s','e','a','r','c','h','"','>', - '<','S',':','s','c','o','p','e','>', - '<','S',':','d','e','e','p','>','/','<','/','S',':','d','e','e','p','>', - '<','/','S',':','s','c','o','p','e','>', - '<','S',':','c','o','n','t','e','n','t','f','r','e','e','t','e','x','t','>', - '<','C',':','t','e','x','t','o','r','p','r','o','p','e','r','t','y','/','>', - 'c','o','m','p','u','t','e','r', - '<','/','S',':','c','o','n','t','e','n','t','f','r','e','e','t','e','x','t','>', - '<','/','S',':','s','e','a','r','c','h','>',0 -}; - -static const WCHAR szComplete6[] = { - '<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\'','1','.','0','\'',' ', - 'e','n','c','o','d','i','n','g','=','\'','W','i','n','d','o','w','s','-','1','2','5','2','\'','?','>','\n', - '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 -}; +static const WCHAR szComplete5[] = + L"<S:search xmlns:D=\"DAV:\" xmlns:C=\"urn:schemas-microsoft-com:office:clipgallery\" xmlns:S=\"urn:schemas-microsoft-com:office:clipgallery:search\">" + "<S:scope><S:deep>/</S:deep></S:scope><S:contentfreetext><C:textorproperty/>computer</S:contentfreetext></S:search>"; static const char complete7[] = { "<?xml version=\"1.0\"?>\n\t" @@ -1172,51 +1146,11 @@ static const char attributes_map[] = { "<a attr1=\"value1\" attr2=\"value2\" attr3=\"value3\" attr4=\"value4\" />" }; -static const WCHAR nonexistent_fileW[] = { - 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 -}; -static const WCHAR nonexistent_attrW[] = { - 'n','o','n','E','x','i','s','i','t','i','n','g','A','t','t','r','i','b','u','t','e',0 -}; -static const WCHAR szDocument[] = { - '#', 'd', 'o', 'c', 'u', 'm', 'e', 'n', 't', 0 -}; +static const WCHAR nonexistent_fileW[] = L"c:\\Nonexistent.xml"; -static const WCHAR szOpen[] = { 'o','p','e','n',0 }; -static const WCHAR szdl[] = { 'd','l',0 }; -static const WCHAR szvr[] = { 'v','r',0 }; -static const WCHAR szlc[] = { 'l','c',0 }; -static const WCHAR szbs[] = { 'b','s',0 }; -static const WCHAR szstr1[] = { 's','t','r','1',0 }; -static const WCHAR szstr2[] = { 's','t','r','2',0 }; -static const WCHAR szstar[] = { '*',0 }; -static const WCHAR szfn1_txt[] = {'f','n','1','.','t','x','t',0}; - -static const WCHAR szComment[] = {'A',' ','C','o','m','m','e','n','t',0 }; -static const WCHAR szCommentXML[] = {'<','!','-','-','A',' ','C','o','m','m','e','n','t','-','-','>',0 }; -static const WCHAR szCommentNodeText[] = {'#','c','o','m','m','e','n','t',0 }; - -static WCHAR szElement[] = {'E','l','e','T','e','s','t', 0 }; -static const WCHAR szElementXML[] = {'<','E','l','e','T','e','s','t','/','>',0 }; -static const WCHAR szElementXML2[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','/','>',0 }; -static const WCHAR szElementXML3[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', - 'T','e','s','t','i','n','g','N','o','d','e','<','/','E','l','e','T','e','s','t','>',0 }; static const WCHAR szElementXML4[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', '&','a','m','p',';','x',' ',0x2103,'<','/','E','l','e','T','e','s','t','>',0 }; -static const WCHAR szAttribute[] = {'A','t','t','r',0 }; -static const WCHAR szAttributeXML[] = {'A','t','t','r','=','"','"',0 }; - -static const WCHAR szCData[] = {'[','1',']','*','2','=','3',';',' ','&','g','e','e',' ','t','h','a','t','s', - ' ','n','o','t',' ','r','i','g','h','t','!', 0}; -static const WCHAR szCDataXML[] = {'<','!','[','C','D','A','T','A','[','[','1',']','*','2','=','3',';',' ','&', - 'g','e','e',' ','t','h','a','t','s',' ','n','o','t',' ','r','i','g','h','t', - '!',']',']','>',0}; -static const WCHAR szCDataNodeText[] = {'#','c','d','a','t','a','-','s','e','c','t','i','o','n',0 }; -static const WCHAR szDocFragmentText[] = {'#','d','o','c','u','m','e','n','t','-','f','r','a','g','m','e','n','t',0 }; - -static const WCHAR szEntityRef[] = {'e','n','t','i','t','y','r','e','f',0 }; -static const WCHAR szEntityRefXML[] = {'&','e','n','t','i','t','y','r','e','f',';',0 }; static const WCHAR szStrangeChars[] = {'&','x',' ',0x2103, 0}; #define expect_bstr_eq_and_free(bstr, expect) { \ @@ -1585,7 +1519,7 @@ if (0) /* try load an empty document */ b = VARIANT_TRUE; - str = SysAllocString( szEmpty ); + str = SysAllocString( L"" ); r = IXMLDOMDocument_loadXML( doc, str, &b ); ok( r == S_FALSE, "loadXML succeeded\n"); ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); @@ -1602,13 +1536,13 @@ if (0) /* try finding a node */ node = NULL; - str = SysAllocString( szstr1 ); + str = SysAllocString( L"str1" ); r = IXMLDOMDocument_selectSingleNode( doc, str, &node ); ok( r == S_FALSE, "ret %08x\n", r ); SysFreeString( str ); b = VARIANT_TRUE; - str = SysAllocString( szIncomplete ); + str = SysAllocString( L"<?xml version='1.0'?>\n" ); r = IXMLDOMDocument_loadXML( doc, str, &b ); ok( r == S_FALSE, "loadXML succeeded\n"); ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); @@ -1631,7 +1565,7 @@ if (0) /* loadXML ignores the encoding attribute and always expects Unicode */ b = VARIANT_FALSE; - str = SysAllocString( szComplete6 ); + str = SysAllocString( L"<?xml version='1.0' encoding='Windows-1252'?>\n<open></open>\n" ); r = IXMLDOMDocument_loadXML( doc, str, &b ); ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); @@ -1667,7 +1601,7 @@ if (0) r = IXMLDOMDocument_get_nodeName( doc, &str ); ok ( r == S_OK, "get_nodeName wrong code\n"); ok ( str != NULL, "str is null\n"); - ok( !lstrcmpW( str, szDocument ), "incorrect nodeName\n"); + ok( !lstrcmpW( str, L"#document" ), "incorrect nodeName\n"); SysFreeString( str ); /* test put_text */ @@ -1699,7 +1633,7 @@ if (0) /* try to load something else simple and valid */ b = VARIANT_FALSE; - str = SysAllocString( szComplete2 ); + str = SysAllocString( L"<?xml version='1.0'?>\n<a></a>\n" ); r = IXMLDOMDocument_loadXML( doc, str, &b ); ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); @@ -1724,7 +1658,7 @@ if (0) ok( r == S_OK, "returns %08x\n", r ); IXMLDOMText_Release(nodetext); - str = SysAllocString( szOpen ); + str = SysAllocString( L"open" ); r = IXMLDOMDocument_createTextNode(doc, str, NULL); ok( r == E_INVALIDARG, "returns %08x\n", r ); r = IXMLDOMDocument_createTextNode(doc, str, &nodetext); @@ -1948,14 +1882,14 @@ if (0) /* test put_data */ V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(szstr1); + V_BSTR(&var) = SysAllocString(L"str1"); r = IXMLDOMText_put_nodeValue(nodetext, var); ok(r == S_OK, "ret %08x\n", r ); VariantClear(&var); r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, szstr1 ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok( !lstrcmpW( str, L"str1" ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); SysFreeString(str); /* test put_data */ @@ -1972,7 +1906,7 @@ if (0) /* ::replaceData() */ V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(szstr1); + V_BSTR(&var) = SysAllocString(L"str1"); r = IXMLDOMText_put_nodeValue(nodetext, var); ok(r == S_OK, "ret %08x\n", r ); VariantClear(&var); @@ -2068,7 +2002,7 @@ if (0) IXMLDOMComment_Release(node_comment); SysFreeString(str); - str = SysAllocString(szComment); + str = SysAllocString(L"A Comment"); r = IXMLDOMDocument_createComment(doc, str, &node_comment); SysFreeString(str); ok( r == S_OK, "returns %08x\n", r ); @@ -2093,7 +2027,7 @@ if (0) } /* test Create Attribute */ - str = SysAllocString(szAttribute); + str = SysAllocString(L"Attr"); r = IXMLDOMDocument_createAttribute(doc, NULL, NULL); ok( r == E_INVALIDARG, "returns %08x\n", r ); r = IXMLDOMDocument_createAttribute(doc, str, &node_attr); @@ -2155,7 +2089,7 @@ if (0) /* test put_data */ V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(szOpen); /* Doesn't matter what the string is, cannot set an xml node. */ + V_BSTR(&var) = SysAllocString(L"open"); /* Doesn't matter what the string is, cannot set an xml node. */ r = IXMLDOMProcessingInstruction_put_nodeValue(nodePI, var); ok(r == E_FAIL, "ret %08x\n", r ); VariantClear(&var); @@ -2290,7 +2224,7 @@ static void test_domnode( void ) str = NULL; r = IXMLDOMElement_get_baseName( element, &str ); ok( r == S_OK, "get_baseName returned wrong code\n"); - ok( lstrcmpW(str,szlc) == 0, "basename was wrong\n"); + ok( !lstrcmpW(str, L"lc"), "Unexpected basename.\n"); SysFreeString(str); /* check if nodename is correct */ @@ -2302,7 +2236,7 @@ static void test_domnode( void ) r = IXMLDOMElement_get_nodeName( element, &str ); ok ( r == S_OK, "get_nodeName wrong code\n"); ok ( str != NULL, "str is null\n"); - ok( !lstrcmpW( str, szlc ), "incorrect nodeName\n"); + ok( !lstrcmpW( str, L"lc" ), "Unexpected nodeName\n"); SysFreeString( str ); str = SysAllocString( nonexistent_fileW ); @@ -2314,13 +2248,13 @@ static void test_domnode( void ) VariantClear(&var); SysFreeString(str); - str = SysAllocString( szdl ); + str = SysAllocString( L"dl" ); V_VT(&var) = VT_I4; V_I4(&var) = 0x1234; r = IXMLDOMElement_getAttribute( element, str, &var ); ok( r == S_OK, "getAttribute ret %08x\n", r ); ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); - ok( !lstrcmpW(V_BSTR(&var), szstr1), "wrong attr value\n"); + ok( !lstrcmpW(V_BSTR(&var), L"str1"), "wrong attr value\n"); VariantClear( &var ); r = IXMLDOMElement_getAttribute( element, NULL, &var ); @@ -2360,20 +2294,20 @@ static void test_domnode( void ) if (map) { - str = SysAllocString( szdl ); + str = SysAllocString( L"dl" ); r = IXMLDOMNamedNodeMap_getNamedItem( map, str, &node ); ok( r == S_OK, "getNamedItem returned wrong code\n"); ok( node != NULL, "should be attributes\n"); IXMLDOMNode_Release(node); SysFreeString( str ); - str = SysAllocString( szdl ); + str = SysAllocString( L"dl" ); r = IXMLDOMNamedNodeMap_getNamedItem( map, str, NULL ); ok( r == E_INVALIDARG, "getNamedItem should return E_INVALIDARG\n"); SysFreeString( str ); /* something that isn't in complete4A */ - str = SysAllocString( szOpen ); + str = SysAllocString( L"open" ); node = (IXMLDOMNode *) 1; r = IXMLDOMNamedNodeMap_getNamedItem( map, str, &node ); ok( r == S_FALSE, "getNamedItem found a node that wasn't there\n"); @@ -2411,7 +2345,7 @@ static void test_domnode( void ) r = IXMLDOMNode_get_nodeName( node, &str ); ok ( r == S_OK, "get_nodeName wrong code\n"); ok ( str != NULL, "str is null\n"); - ok( !lstrcmpW( str, szdl ), "incorrect node name\n"); + ok( !lstrcmpW( str, L"dl" ), "incorrect node name\n"); SysFreeString( str ); IXMLDOMNode_Release( node ); @@ -2450,7 +2384,7 @@ static void test_domnode( void ) str = NULL; r = IXMLDOMNode_get_baseName( node, &str ); ok( r == S_OK, "get_baseName returned wrong code\n"); - ok( lstrcmpW(str,szdl) == 0, "basename was wrong\n"); + ok( !lstrcmpW(str, L"dl"), "Unexpected basename.\n"); SysFreeString( str ); r = IXMLDOMNode_get_childNodes( node, NULL ); @@ -2521,13 +2455,13 @@ static void test_domnode( void ) ole_check(IXMLDOMNodeList_reset(list)); node = (void*)0xdeadbeef; - str = SysAllocString(szdl); + str = SysAllocString(L"dl"); r = IXMLDOMElement_selectSingleNode( element, str, &node ); SysFreeString(str); ok( r == S_FALSE, "ret %08x\n", r ); ok( node == NULL, "node %p\n", node ); - str = SysAllocString(szbs); + str = SysAllocString(L"bs"); r = IXMLDOMElement_selectSingleNode( element, str, &node ); SysFreeString(str); ok( r == S_OK, "ret %08x\n", r ); @@ -2573,7 +2507,7 @@ static void test_domnode( void ) str = NULL; r = IXMLDOMNode_get_baseName( node, &str ); ok( r == S_OK, "get_baseName returned wrong code\n"); - ok( lstrcmpW(str,szbs) == 0, "basename was wrong\n"); + ok( !lstrcmpW(str, L"bs"), "Unexpected basename.\n"); SysFreeString(str); } else @@ -2601,14 +2535,13 @@ static void test_domnode( void ) if (element) { - static const WCHAR szSSearch[] = {'S',':','s','e','a','r','c','h',0}; BSTR tag = NULL; /* check if the tag is correct */ r = IXMLDOMElement_get_tagName( element, &tag ); ok( r == S_OK, "couldn't get tag name\n"); ok( tag != NULL, "tag was null\n"); - ok( !lstrcmpW( tag, szSSearch ), "incorrect tag name\n"); + ok( !lstrcmpW( tag, L"S:search" ), "incorrect tag name\n"); SysFreeString( tag ); IXMLDOMElement_Release( element ); @@ -2935,8 +2868,6 @@ todo_wine { static void test_create(void) { - static const WCHAR szOne[] = {'1',0}; - static const WCHAR szOneGarbage[] = {'1','G','a','r','b','a','g','e',0}; HRESULT r; VARIANT var; BSTR str, name; @@ -3148,7 +3079,7 @@ static void test_create(void) V_VT(&var) = VT_I1; V_I1(&var) = NODE_ATTRIBUTE; - str = SysAllocString( szlc ); + str = SysAllocString( L"lc" ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); @@ -3157,7 +3088,7 @@ static void test_create(void) /* a name is required for attribute, try a BSTR with first null wchar */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_ATTRIBUTE; - str = SysAllocString( szstr1 ); + str = SysAllocString( L"str1" ); str[0] = 0; node = (IXMLDOMNode*)0x1; r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); @@ -3217,7 +3148,7 @@ static void test_create(void) V_VT(&var) = VT_I1; V_I1(&var) = NODE_ELEMENT; - str = SysAllocString( szlc ); + str = SysAllocString( L"lc" ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); @@ -3234,14 +3165,14 @@ static void test_create(void) if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString( szOne ); + V_BSTR(&var) = SysAllocString( L"1" ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); VariantClear(&var); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString( szOneGarbage ); + V_BSTR(&var) = SysAllocString( L"1Garbage" ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == E_INVALIDARG, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); @@ -3266,7 +3197,7 @@ static void test_create(void) V_VT(&var) = VT_I4; V_I4(&var) = NODE_ELEMENT; - str = SysAllocString( szbs ); + str = SysAllocString( L"bs" ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); SysFreeString( str ); @@ -3313,8 +3244,8 @@ static void test_create(void) IXMLDOMNamedNodeMap_Release( attr_map ); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString( szstr1 ); - name = SysAllocString( szdl ); + V_BSTR(&var) = SysAllocString( L"str1" ); + name = SysAllocString( L"dl" ); r = IXMLDOMElement_setAttribute( element, name, var ); ok( r == S_OK, "returns %08x\n", r ); r = IXMLDOMElement_get_attributes( element, &attr_map ); @@ -3326,7 +3257,7 @@ static void test_create(void) VariantClear(&var); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString( szstr2 ); + V_BSTR(&var) = SysAllocString( L"str2" ); r = IXMLDOMElement_setAttribute( element, name, var ); ok( r == S_OK, "returns %08x\n", r ); r = IXMLDOMElement_get_attributes( element, &attr_map ); @@ -3338,13 +3269,13 @@ static void test_create(void) VariantClear(&var); r = IXMLDOMElement_getAttribute( element, name, &var ); ok( r == S_OK, "returns %08x\n", r ); - ok( !lstrcmpW(V_BSTR(&var), szstr2), "wrong attr value\n"); + ok( !lstrcmpW(V_BSTR(&var), L"str2"), "wrong attr value\n"); VariantClear(&var); SysFreeString(name); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString( szstr1 ); - name = SysAllocString( szlc ); + V_BSTR(&var) = SysAllocString( L"str1" ); + name = SysAllocString( L"lc" ); r = IXMLDOMElement_setAttribute( element, name, var ); ok( r == S_OK, "returns %08x\n", r ); r = IXMLDOMElement_get_attributes( element, &attr_map ); @@ -3358,7 +3289,7 @@ static void test_create(void) V_VT(&var) = VT_I4; V_I4(&var) = 10; - name = SysAllocString( szbs ); + name = SysAllocString( L"bs" ); r = IXMLDOMElement_setAttribute( element, name, var ); ok( r == S_OK, "returns %08x\n", r ); VariantClear(&var); @@ -3371,7 +3302,7 @@ static void test_create(void) /* Create an Attribute */ V_VT(&var) = VT_I4; V_I4(&var) = NODE_ATTRIBUTE; - str = SysAllocString( szAttribute ); + str = SysAllocString( L"Attr" ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); ok( node != NULL, "node was null\n"); @@ -3435,7 +3366,7 @@ static void test_getElementsByTagName(void) } /* broken query BSTR */ - memcpy(&buff[2], szstar, sizeof(szstar)); + memcpy(&buff[2], L"*", 2 * sizeof(WCHAR)); /* just a big length */ *(DWORD*)buff = 0xf0f0; r = IXMLDOMDocument_getElementsByTagName(doc, &buff[2], &node_list); @@ -3449,7 +3380,7 @@ static void test_getElementsByTagName(void) r = IXMLDOMDocument_get_documentElement(doc, &elem); ok( r == S_OK, "ret %08x\n", r ); - str = SysAllocString( szstar ); + str = SysAllocString( L"*" ); /* null arguments cases */ r = IXMLDOMElement_getElementsByTagName(elem, NULL, &node_list); @@ -3466,7 +3397,7 @@ static void test_getElementsByTagName(void) SysFreeString( str ); /* broken query BSTR */ - memcpy(&buff[2], szstar, sizeof(szstar)); + memcpy(&buff[2], L"*", 2 * sizeof(WCHAR)); /* just a big length */ *(DWORD*)buff = 0xf0f0; r = IXMLDOMElement_getElementsByTagName(elem, &buff[2], &node_list); @@ -3501,7 +3432,7 @@ static void test_get_text(void) ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); - str = SysAllocString( szbs ); + str = SysAllocString( L"bs" ); r = IXMLDOMDocument_getElementsByTagName( doc, str, &node_list ); ok( r == S_OK, "ret %08x\n", r ); SysFreeString(str); @@ -3541,20 +3472,20 @@ static void test_get_text(void) r = IXMLDOMNode_get_text( node, &str ); ok( r == S_OK, "ret %08x\n", r ); - ok( !memcmp(str, szfn1_txt, lstrlenW(szfn1_txt) ), "wrong string\n" ); + ok( !lstrcmpW(str, L"fn1.txt"), "wrong string\n" ); SysFreeString(str); r = IXMLDOMNode_get_attributes( node, &node_map ); ok( r == S_OK, "ret %08x\n", r ); - str = SysAllocString( szvr ); + str = SysAllocString( L"vr" ); r = IXMLDOMNamedNodeMap_getNamedItem( node_map, str, &node2 ); ok( r == S_OK, "ret %08x\n", r ); SysFreeString(str); r = IXMLDOMNode_get_text( node2, &str ); ok( r == S_OK, "ret %08x\n", r ); - ok( !memcmp(str, szstr2, sizeof(szstr2)), "wrong string\n" ); + ok( !lstrcmpW(str, L"str2"), "Unexpected string.\n" ); SysFreeString(str); r = IXMLDOMNode_get_firstChild( node2, &node3 ); @@ -3562,7 +3493,7 @@ static void test_get_text(void) r = IXMLDOMNode_get_text( node3, &str ); ok( r == S_OK, "ret %08x\n", r ); - ok( !memcmp(str, szstr2, sizeof(szstr2)), "wrong string\n" ); + ok( !lstrcmpW(str, L"str2"), "Unexpected string.\n" ); SysFreeString(str); @@ -3780,7 +3711,6 @@ static void test_get_childNodes(void) static void test_get_firstChild(void) { - static const WCHAR xmlW[] = {'x','m','l',0}; IXMLDOMDocument *doc; IXMLDOMNode *node; VARIANT_BOOL b; @@ -3799,7 +3729,7 @@ static void test_get_firstChild(void) r = IXMLDOMNode_get_nodeName( node, &str ); ok( r == S_OK, "ret %08x\n", r); - ok(!lstrcmpW(str, xmlW), "expected \"xml\" node name, got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"xml"), "expected \"xml\" node name, got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release( node ); @@ -3810,8 +3740,6 @@ static void test_get_firstChild(void) static void test_get_lastChild(void) { - static const WCHAR lcW[] = {'l','c',0}; - static const WCHAR foW[] = {'f','o',0}; IXMLDOMDocument *doc; IXMLDOMNode *node, *child; VARIANT_BOOL b; @@ -3830,7 +3758,7 @@ static void test_get_lastChild(void) r = IXMLDOMNode_get_nodeName( node, &str ); ok( r == S_OK, "ret %08x\n", r); - ok(memcmp(str, lcW, sizeof(lcW)) == 0, "expected \"lc\" node name\n"); + ok(!lstrcmpW(str, L"lc"), "Unexpected node name.\n"); SysFreeString(str); r = IXMLDOMNode_get_lastChild( node, &child ); @@ -3839,7 +3767,7 @@ static void test_get_lastChild(void) r = IXMLDOMNode_get_nodeName( child, &str ); ok( r == S_OK, "ret %08x\n", r); - ok(memcmp(str, foW, sizeof(foW)) == 0, "expected \"fo\" node name\n"); + ok(!lstrcmpW(str, L"fo"), "Unexpected node name.\n"); SysFreeString(str); IXMLDOMNode_Release( child ); @@ -4100,7 +4028,7 @@ static void test_removeNamedItem(void) ok ( removed_node == (void*)0xdeadbeef, "got %p\n", removed_node); removed_node = (void*)0xdeadbeef; - str = SysAllocString(szvr); + str = SysAllocString(L"vr"); r = IXMLDOMNamedNodeMap_removeNamedItem( map, str, &removed_node ); ok ( r == S_OK, "ret %08x\n", r); @@ -4318,7 +4246,6 @@ static void _test_IObjectSafety_common(unsigned line, IObjectSafety *safety) static void test_IXMLDOMDocument2(void) { - static const WCHAR emptyW[] = {0}; IXMLDOMDocument2 *doc2, *dtddoc2; IXMLDOMDocument *doc; IXMLDOMParseError* err; @@ -4410,7 +4337,7 @@ static void test_IXMLDOMDocument2(void) ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XSLPattern"))); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(emptyW); + V_BSTR(&var) = SysAllocString(L""); r = IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionNamespaces"), var); ok(r == S_OK, "got 0x%08x\n", r); VariantClear(&var); @@ -4688,10 +4615,6 @@ static inline void _check_ws_preserved(int line, const char *ver, IXMLDOMDocumen static void test_preserve_charref(IXMLDOMDocument2 *doc, VARIANT_BOOL preserve) { - static const WCHAR b1_p[] = {' ','T','e','x','t',' ','A',' ','e','n','d',' ',0}; - static const WCHAR b1_i[] = {'T','e','x','t',' ','A',' ','e','n','d',0}; - static const WCHAR b2_p[] = {'A','B',' ','C',' ',0}; - static const WCHAR b2_i[] = {'A','B',' ','C',0}; IXMLDOMNodeList *list; IXMLDOMElement *root; IXMLDOMNode *node; @@ -4713,7 +4636,7 @@ static void test_preserve_charref(IXMLDOMDocument2 *doc, VARIANT_BOOL preserve) ok(hr == S_OK, "got 0x%08x\n", hr); IXMLDOMElement_Release(root); - text = preserve == VARIANT_TRUE ? b1_p : b1_i; + text = preserve == VARIANT_TRUE ? L" Text A end " : L"Text A end"; hr = IXMLDOMNodeList_get_item(list, 0, &node); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXMLDOMNode_get_text(node, &s); @@ -4722,7 +4645,7 @@ static void test_preserve_charref(IXMLDOMDocument2 *doc, VARIANT_BOOL preserve) SysFreeString(s); IXMLDOMNode_Release(node); - text = preserve == VARIANT_TRUE ? b2_p : b2_i; + text = preserve == VARIANT_TRUE ? L"AB C " : L"AB C"; hr = IXMLDOMNodeList_get_item(list, 1, &node); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXMLDOMNode_get_text(node, &s); @@ -5540,7 +5463,7 @@ static void test_xmlTypes(void) if(hr == S_OK) { /* Comment */ - str = SysAllocString(szComment); + str = SysAllocString(L"A Comment"); hr = IXMLDOMDocument_createComment(doc, str, &pComment); SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); @@ -5551,12 +5474,12 @@ static void test_xmlTypes(void) hr = IXMLDOMComment_get_nodeName(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szCommentNodeText ), "incorrect comment node Name\n"); + ok( !lstrcmpW( str, L"#comment" ), "incorrect comment node Name\n"); SysFreeString(str); hr = IXMLDOMComment_get_xml(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szCommentXML ), "incorrect comment xml\n"); + ok( !lstrcmpW( str, L"" ), "incorrect comment xml\n"); SysFreeString(str); /* put data Tests */ @@ -5760,7 +5683,7 @@ static void test_xmlTypes(void) /* ::replaceData() */ V_VT(&v) = VT_BSTR; - V_BSTR(&v) = SysAllocString(szstr1); + V_BSTR(&v) = SysAllocString(L"str1"); hr = IXMLDOMComment_put_nodeValue(pComment, v); ok(hr == S_OK, "ret %08x\n", hr ); VariantClear(&v); @@ -5833,7 +5756,7 @@ static void test_xmlTypes(void) } /* Element */ - str = SysAllocString(szElement); + str = SysAllocString(L"EleTest"); hr = IXMLDOMDocument_createElement(doc, str, &pElement); SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); @@ -5844,12 +5767,12 @@ static void test_xmlTypes(void) hr = IXMLDOMElement_get_nodeName(pElement, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szElement ), "incorrect element node Name\n"); + ok( !lstrcmpW( str, L"EleTest" ), "incorrect element node Name\n"); SysFreeString(str); hr = IXMLDOMElement_get_xml(pElement, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szElementXML ), "incorrect element xml\n"); + ok( !lstrcmpW( str, L"<EleTest/>" ), "incorrect element xml\n"); SysFreeString(str); /* Attribute */ @@ -5863,7 +5786,7 @@ static void test_xmlTypes(void) ok(hr == E_FAIL, "ret %08x\n", hr ); ok(pAttribute == (void*)0x1, "Expect same ptr, got %p\n", pAttribute); - str = SysAllocString(szAttribute); + str = SysAllocString(L"Attr"); hr = IXMLDOMDocument_createAttribute(doc, str, &pAttribute); SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); @@ -5904,24 +5827,24 @@ static void test_xmlTypes(void) hr = IXMLDOMAttribute_get_nodeName(pAttribute, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szAttribute ), "incorrect attribute node Name\n"); + ok( !lstrcmpW( str, L"Attr" ), "incorrect attribute node Name\n"); SysFreeString(str); /* test nodeName */ hr = IXMLDOMAttribute_get_nodeName(pAttribute, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szAttribute ), "incorrect nodeName string\n"); + ok( !lstrcmpW( str, L"Attr" ), "incorrect nodeName string\n"); SysFreeString(str); /* test name property */ hr = IXMLDOMAttribute_get_name(pAttribute, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szAttribute ), "incorrect name string\n"); + ok( !lstrcmpW( str, L"Attr" ), "incorrect name string\n"); SysFreeString(str); hr = IXMLDOMAttribute_get_xml(pAttribute, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szAttributeXML ), "incorrect attribute xml\n"); + ok( !lstrcmpW( str, L"Attr=\"\"" ), "incorrect attribute xml\n"); SysFreeString(str); IXMLDOMAttribute_Release(pAttribute); @@ -5929,7 +5852,7 @@ static void test_xmlTypes(void) /* Check Element again with the Add Attribute*/ hr = IXMLDOMElement_get_xml(pElement, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szElementXML2 ), "incorrect element xml\n"); + ok( !lstrcmpW( str, L"<EleTest Attr=\"\"/>" ), "incorrect element xml\n"); SysFreeString(str); } @@ -5938,7 +5861,7 @@ static void test_xmlTypes(void) hr = IXMLDOMElement_get_xml(pElement, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szElementXML3 ), "incorrect element xml\n"); + ok( !lstrcmpW( str, L"<EleTest Attr=\"\">TestingNode</EleTest>" ), "incorrect element xml\n"); SysFreeString(str); /* Test for reversible escaping */ @@ -5961,7 +5884,7 @@ static void test_xmlTypes(void) } /* CData Section */ - str = SysAllocString(szCData); + str = SysAllocString(L"[1]*2=3; &gee thats not right!"); hr = IXMLDOMDocument_createCDATASection(doc, str, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); @@ -5983,12 +5906,12 @@ static void test_xmlTypes(void) hr = IXMLDOMCDATASection_get_nodeName(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szCDataNodeText ), "incorrect cdata node Name\n"); + ok( !lstrcmpW( str, L"#cdata-section" ), "incorrect cdata node Name\n"); SysFreeString(str); hr = IXMLDOMCDATASection_get_xml(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szCDataXML ), "incorrect cdata xml\n"); + ok( !lstrcmpW( str, L"<![CDATA[[1]*2=3; &gee thats not right!]]>" ), "incorrect cdata xml\n"); SysFreeString(str); /* test lastChild */ @@ -6199,7 +6122,7 @@ static void test_xmlTypes(void) /* ::replaceData() */ V_VT(&v) = VT_BSTR; - V_BSTR(&v) = SysAllocString(szstr1); + V_BSTR(&v) = SysAllocString(L"str1"); hr = IXMLDOMCDATASection_put_nodeValue(pCDataSec, v); ok(hr == S_OK, "ret %08x\n", hr ); VariantClear(&v); @@ -6294,7 +6217,7 @@ static void test_xmlTypes(void) hr = IXMLDOMDocumentFragment_get_nodeName(pDocFrag, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szDocFragmentText ), "incorrect docfragment node Name\n"); + ok( !lstrcmpW( str, L"#document-fragment" ), "incorrect docfragment node Name\n"); SysFreeString(str); /* test next Sibling*/ @@ -6324,7 +6247,7 @@ static void test_xmlTypes(void) hr = IXMLDOMDocument_createEntityReference(doc, _bstr_(""), &pEntityRef); ok(hr == E_FAIL, "ret %08x\n", hr ); - str = SysAllocString(szEntityRef); + str = SysAllocString(L"entityref"); hr = IXMLDOMDocument_createEntityReference(doc, str, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); @@ -6339,7 +6262,7 @@ static void test_xmlTypes(void) /* test get_xml*/ hr = IXMLDOMEntityReference_get_xml(pEntityRef, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szEntityRefXML ), "incorrect xml string\n"); + ok( !lstrcmpW( str, L"&entityref;" ), "incorrect xml string\n"); SysFreeString(str); IXMLDOMEntityReference_Release(pEntityRef); @@ -7204,7 +7127,6 @@ static void test_TransformWithLoadingLocalFile(void) static void test_put_nodeValue(void) { - static const WCHAR jeevesW[] = {'J','e','e','v','e','s',' ','&',' ','W','o','o','s','t','e','r',0}; IXMLDOMDocument *doc; IXMLDOMText *text; IXMLDOMEntityReference *entityref; @@ -7282,8 +7204,7 @@ static void test_put_nodeValue(void) ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMAttribute_get_nodeValue(attr, &data); ok(hr == S_OK, "ret %08x\n", hr ); - ok(memcmp(V_BSTR(&data), jeevesW, sizeof(jeevesW)) == 0, "got %s\n", - wine_dbgstr_w(V_BSTR(&data))); + ok(!lstrcmpW(V_BSTR(&data), L"Jeeves & Wooster"), "got %s\n", wine_dbgstr_w(V_BSTR(&data))); VariantClear(&data); IXMLDOMAttribute_Release(attr); @@ -8608,7 +8529,6 @@ static void test_events(void) static void test_createProcessingInstruction(void) { - static const WCHAR bodyW[] = {'t','e','s','t',0}; IXMLDOMProcessingInstruction *pi; IXMLDOMDocument *doc; WCHAR buff[10]; @@ -8617,7 +8537,7 @@ static void test_createProcessingInstruction(void) doc = create_document(&IID_IXMLDOMDocument); /* test for BSTR handling, pass broken BSTR */ - memcpy(&buff[2], bodyW, sizeof(bodyW)); + memcpy(&buff[2], L"test", 5 * sizeof(WCHAR)); /* just a big length */ *(DWORD*)buff = 0xf0f0; hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("test"), &buff[2], &pi); @@ -9593,7 +9513,6 @@ static void test_appendChild(void) static void test_get_doctype(void) { - static const WCHAR emailW[] = {'e','m','a','i','l',0}; IXMLDOMDocumentType *doctype; IXMLDOMDocument *doc; VARIANT_BOOL b; @@ -9624,12 +9543,12 @@ static void test_get_doctype(void) hr = IXMLDOMDocumentType_get_name(doctype, &s); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(emailW, s), "got name %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(L"email", s), "got name %s\n", wine_dbgstr_w(s)); SysFreeString(s); hr = IXMLDOMDocumentType_get_nodeName(doctype, &s); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(emailW, s), "got name %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(L"email", s), "got name %s\n", wine_dbgstr_w(s)); SysFreeString(s); IXMLDOMDocumentType_Release(doctype); @@ -10651,7 +10570,6 @@ static void test_load(void) static void test_domobj_dispex(IUnknown *obj) { - static const WCHAR testW[] = {'t','e','s','t','p','r','o','p',0}; DISPID dispid = DISPID_XMLDOM_NODELIST_RESET; IDispatchEx *dispex; IUnknown *unk; @@ -10669,7 +10587,7 @@ static void test_domobj_dispex(IUnknown *obj) EXPECT_HR(hr, S_OK); ok(ticnt == 1, "ticnt=%u\n", ticnt); - name = SysAllocString(szstar); + name = SysAllocString(L"*"); hr = IDispatchEx_DeleteMemberByName(dispex, name, fdexNameCaseSensitive); EXPECT_HR(hr, E_NOTIMPL); SysFreeString(name); @@ -10694,7 +10612,7 @@ static void test_domobj_dispex(IUnknown *obj) EXPECT_HR(hr, E_NOTIMPL); ok(unk == (IUnknown*)0xdeadbeef, "got %p\n", unk); - name = SysAllocString(testW); + name = SysAllocString(L"testprop"); hr = IDispatchEx_GetDispID(dispex, name, fdexNameEnsure, &dispid); ok(hr == DISP_E_UNKNOWNNAME, "got 0x%08x\n", hr); SysFreeString(name); @@ -11677,7 +11595,7 @@ static void test_getAttributeNode(void) ok(attr == NULL, "got %p\n", attr); SysFreeString(str); - str = SysAllocString(nonexistent_attrW); + str = SysAllocString(L"nonExistingAttribute"); hr = IXMLDOMElement_getAttributeNode(elem, str, NULL); EXPECT_HR(hr, S_FALSE); @@ -12355,7 +12273,6 @@ static const DOMNodeType put_data_types[] = { static void test_put_data(void) { - static const WCHAR test_data[] = {'t','e','s','t',' ','n','o','d','e',' ','d','a','t','a',0}; WCHAR buff[100], *data; IXMLDOMDocument *doc; const DOMNodeType *type; @@ -12367,7 +12284,7 @@ static void test_put_data(void) doc = create_document(&IID_IXMLDOMDocument); - memcpy(&buff[2], test_data, sizeof(test_data)); + memcpy(&buff[2], L"test node data", 15 * sizeof(WCHAR)); /* just a big length */ *(DWORD*)buff = 0xf0f0; data = &buff[2]; @@ -13042,7 +12959,7 @@ static void test_merging_text(void) /* test xmlAddChild */ for (i = 0; i < 10; i++) { - str = SysAllocString(szstr1); + str = SysAllocString(L"str1"); hr = IXMLDOMDocument_createTextNode(doc, str, &nodetext); SysFreeString(str); EXPECT_HR(hr, S_OK); @@ -13063,7 +12980,7 @@ static void test_merging_text(void) V_UNKNOWN(&v) = (IUnknown*)first; for (i = 0; i < 10; i++) { - str = SysAllocString(szstr2); + str = SysAllocString(L"str2"); hr = IXMLDOMDocument_createTextNode(doc, str, &nodetext); SysFreeString(str); EXPECT_HR(hr, S_OK); -- 2.28.0

1 0

[PATCH] oleaut32: Do not forward IErrorInfo functions.
by Nikolay Sivov 06 Oct '20

06 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49946 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- These are not forwards on Windows. dlls/oleaut32/oleaut32.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index cc18a04befe..21b52f1f06e 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -194,9 +194,9 @@ 197 stdcall VarDecFromStr(wstr long long ptr) 198 stdcall VarDecFromDisp(ptr long ptr) 199 stdcall VarDecFromBool(long ptr) -200 stdcall GetErrorInfo(long ptr) ole32.GetErrorInfo -201 stdcall SetErrorInfo(long ptr) ole32.SetErrorInfo -202 stdcall CreateErrorInfo(ptr) ole32.CreateErrorInfo +200 stdcall -import GetErrorInfo(long ptr) +201 stdcall -import SetErrorInfo(long ptr) +202 stdcall -import CreateErrorInfo(ptr) 203 stdcall VarDecRound(ptr long ptr) 204 stdcall VarDecCmp(ptr ptr) 205 stdcall VarI2FromI1(long ptr) -- 2.28.0

1 0

[PATCH 1/4] ws2_32/tests: Avoid using skip() or trace() for tests that should not fail.
by Zebediah Figura 06 Oct '20

06 Oct '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 805 ++++++++------------------------------- 1 file changed, 154 insertions(+), 651 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7f3c6a9fb35..1e0d3ff24de 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -230,105 +230,75 @@ static int client_id; static SOCKET setup_server_socket(struct sockaddr_in *addr, int *len); static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len, BOOL nonblock); -static int tcp_socketpair(SOCKET *src, SOCKET *dst) +static void tcp_socketpair(SOCKET *src, SOCKET *dst) { SOCKET server = INVALID_SOCKET; struct sockaddr_in addr; int len; int ret; - *src = INVALID_SOCKET; - *dst = INVALID_SOCKET; - *src = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (*src == INVALID_SOCKET) - goto end; + ok(*src != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); server = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (server == INVALID_SOCKET) - goto end; + ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; addr.sin_addr.s_addr = inet_addr("127.0.0.1"); ret = bind(server, (struct sockaddr*)&addr, sizeof(addr)); - if (ret != 0) - goto end; + ok(!ret, "failed to bind socket, error %u\n", WSAGetLastError()); len = sizeof(addr); ret = getsockname(server, (struct sockaddr*)&addr, &len); - if (ret != 0) - goto end; + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); ret = listen(server, 1); - if (ret != 0) - goto end; + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); ret = connect(*src, (struct sockaddr*)&addr, sizeof(addr)); - if (ret != 0) - goto end; + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); len = sizeof(addr); *dst = accept(server, (struct sockaddr*)&addr, &len); + ok(*dst != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); -end: - if (server != INVALID_SOCKET) - closesocket(server); - if (*src != INVALID_SOCKET && *dst != INVALID_SOCKET) - return 0; - closesocket(*src); - closesocket(*dst); - return -1; + closesocket(server); } -static int tcp_socketpair_ovl(SOCKET *src, SOCKET *dst) +static void tcp_socketpair_ovl(SOCKET *src, SOCKET *dst) { SOCKET server = INVALID_SOCKET; struct sockaddr_in addr; int len, ret; - *src = INVALID_SOCKET; - *dst = INVALID_SOCKET; - *src = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); - if (*src == INVALID_SOCKET) - goto end; + ok(*src != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); server = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); - if (server == INVALID_SOCKET) - goto end; + ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; addr.sin_addr.s_addr = inet_addr("127.0.0.1"); ret = bind(server, (struct sockaddr *)&addr, sizeof(addr)); - if (ret != 0) - goto end; + ok(!ret, "failed to bind socket, error %u\n", WSAGetLastError()); len = sizeof(addr); ret = getsockname(server, (struct sockaddr *)&addr, &len); - if (ret != 0) - goto end; + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); ret = listen(server, 1); - if (ret != 0) - goto end; + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); ret = connect(*src, (struct sockaddr *)&addr, sizeof(addr)); - if (ret != 0) - goto end; + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); len = sizeof(addr); *dst = accept(server, (struct sockaddr *)&addr, &len); + ok(*dst != INVALID_SOCKET, "failed to accept socket, error %u\n", WSAGetLastError()); -end: - if (server != INVALID_SOCKET) - closesocket(server); - if (*src != INVALID_SOCKET && *dst != INVALID_SOCKET) - return 0; - closesocket(*src); - closesocket(*dst); - return -1; + closesocket(server); } static void set_so_opentype ( BOOL overlapped ) @@ -1197,7 +1167,7 @@ static void test_WithWSAStartup(void) for (socks = 0; socks < ARRAY_SIZE(pairs); socks++) { WSAPROTOCOL_INFOA info; - if (tcp_socketpair(&pairs[socks].src, &pairs[socks].dst)) break; + tcp_socketpair(&pairs[socks].src, &pairs[socks].dst); memset(&info, 0, sizeof(info)); ok(!WSADuplicateSocketA(pairs[socks].src, GetCurrentProcessId(), &info), @@ -1364,20 +1334,8 @@ static void do_test( test_setup *test ) WaitForSingleObject ( server_ready, INFINITE ); wait = WaitForMultipleObjects ( 1 + n, thread, TRUE, 1000 * TEST_TIMEOUT ); - ok ( wait <= WAIT_OBJECT_0 + n , - "some threads have not completed: %x\n", wait ); + ok(!wait, "wait failed, error %u\n", wait); - if ( ! ( wait <= WAIT_OBJECT_0 + n ) ) - { - for (i = 0; i <= n; i++) - { - if ( WaitForSingleObject ( thread[i], 0 ) != WAIT_OBJECT_0 ) - { - trace ("terminating thread %08x\n", thread_id[i]); - TerminateThread ( thread [i], 0 ); - } - } - } CloseHandle ( server_ready ); for (i = 0; i <= n; i++) CloseHandle ( client_ready[i] ); @@ -1910,11 +1868,6 @@ todo_wine closesocket(s); s = socket(family, SOCK_STREAM, 0); - if (s == INVALID_SOCKET && i) - { - skip("IPv6 is not supported\n"); - break; - } ok(s != INVALID_SOCKET, "socket failed with error %d\n", GetLastError()); size = sizeof(value); @@ -2063,11 +2016,6 @@ static void test_ip_pktinfo(void) memset(&ov, 0, sizeof(ov)); ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - if (ov.hEvent == INVALID_HANDLE_VALUE) - { - skip("Could not create event object, some tests will be skipped. errno = %d\n", GetLastError()); - return; - } memset(&hdr, 0x00, sizeof(hdr)); s1addr.sin_family = AF_INET; @@ -2089,21 +2037,12 @@ static void test_ip_pktinfo(void) /* Build "server" side socket */ s1=socket(AF_INET, SOCK_DGRAM, 0); - if (s1 == INVALID_SOCKET) - { - skip("socket() failed error, some tests skipped: %d\n", WSAGetLastError()); - goto cleanup; - } + ok(s1 != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); /* Obtain the WSARecvMsg function */ - WSAIoctl(s1, SIO_GET_EXTENSION_FUNCTION_POINTER, &WSARecvMsg_GUID, sizeof(WSARecvMsg_GUID), + rc = WSAIoctl(s1, SIO_GET_EXTENSION_FUNCTION_POINTER, &WSARecvMsg_GUID, sizeof(WSARecvMsg_GUID), &pWSARecvMsg, sizeof(pWSARecvMsg), &dwBytes, NULL, NULL); - if (!pWSARecvMsg) - { - win_skip("WSARecvMsg is unsupported, some tests will be skipped.\n"); - closesocket(s1); - goto cleanup; - } + ok(!rc, "failed to get WSARecvMsg, error %u\n", WSAGetLastError()); /* Setup the server side socket */ rc=bind(s1, (struct sockaddr*)&s1addr, sizeof(s1addr)); @@ -2111,20 +2050,11 @@ static void test_ip_pktinfo(void) /* Build "client" side socket */ addrlen = sizeof(s2addr); - if (getsockname(s1, (struct sockaddr *) &s2addr, &addrlen) != 0) - { - skip("Failed to call getsockname, some tests skipped: %d\n", WSAGetLastError()); - closesocket(s1); - goto cleanup; - } + rc = getsockname(s1, (struct sockaddr *) &s2addr, &addrlen); + ok(!rc, "failed to get address, error %u\n", WSAGetLastError()); s2addr.sin_addr.s_addr = addresses[0]; /* Always target the local adapter address */ s2=socket(AF_INET, SOCK_DGRAM, 0); - if (s2 == INVALID_SOCKET) - { - skip("socket() failed error, some tests skipped: %d\n", WSAGetLastError()); - closesocket(s1); - goto cleanup; - } + ok(s2 != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); /* Test an empty message header */ rc=pWSARecvMsg(s1, NULL, NULL, NULL, NULL); @@ -2170,13 +2100,7 @@ static void test_ip_pktinfo(void) rc=sendto(s2, msg, sizeof(msg), 0, (struct sockaddr*)&s2addr, sizeof(s2addr)); ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); - if (WaitForSingleObject(ov.hEvent, 100) != WAIT_OBJECT_0) - { - skip("Server side did not receive packet, some tests skipped.\n"); - closesocket(s2); - closesocket(s1); - continue; - } + ok(!WaitForSingleObject(ov.hEvent, 100), "wait failed\n"); dwFlags = 0; WSAGetOverlappedResult(s1, &ov, NULL, FALSE, &dwFlags); ok(dwFlags == 0, @@ -2197,13 +2121,7 @@ static void test_ip_pktinfo(void) "WSARecvMsg() control length mismatch (%d != sizeof pktbuf).\n", hdr.Control.len); rc=sendto(s2, msg, sizeof(msg), 0, (struct sockaddr*)&s2addr, sizeof(s2addr)); ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); - if (WaitForSingleObject(ov.hEvent, 100) != WAIT_OBJECT_0) - { - skip("Server side did not receive packet, some tests skipped.\n"); - closesocket(s2); - closesocket(s1); - continue; - } + ok(!WaitForSingleObject(ov.hEvent, 100), "wait failed\n"); dwSize = 0; WSAGetOverlappedResult(s1, &ov, &dwSize, FALSE, NULL); ok(dwSize == sizeof(msg), @@ -2231,7 +2149,6 @@ static void test_ip_pktinfo(void) closesocket(s1); } -cleanup: CloseHandle(ov.hEvent); } @@ -2555,10 +2472,6 @@ static void test_WSASocket(void) pi = HeapAlloc(GetProcessHeap(), 0, pi_size); ok(pi != NULL, "Failed to allocate memory\n"); - if (pi == NULL) { - skip("Can't continue without memory.\n"); - return; - } items = WSAEnumProtocolsA(wsaproviders, pi, &pi_size); ok(items != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", @@ -2637,10 +2550,6 @@ static void test_WSASocket(void) pi = HeapAlloc(GetProcessHeap(), 0, pi_size); ok(pi != NULL, "Failed to allocate memory\n"); - if (pi == NULL) { - skip("Can't continue without memory.\n"); - return; - } items = WSAEnumProtocolsA(NULL, pi, &pi_size); ok(items != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", @@ -2995,7 +2904,7 @@ static void test_WSAEnumNetworkEvents(void) for (i = 0; i < ARRAY_SIZE(sock_type); i++) { if (i == 2) - ok(!tcp_socketpair(&s, &s2), "Test[%d]: creating socket pair failed\n", i); + tcp_socketpair(&s, &s2); else { s = socket(AF_INET, sock_type[i], 0); @@ -3603,7 +3512,7 @@ static void test_select(void) ok ( WSAGetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", WSAGetLastError()); ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); - ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + tcp_socketpair(&fdRead, &fdWrite); maxfd = fdRead; if(fdWrite > maxfd) maxfd = fdWrite; @@ -3809,7 +3718,7 @@ static void test_select(void) closesocket(fdWrite); /* Try select() on a closed socket after connection */ - ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + tcp_socketpair(&fdRead, &fdWrite); closesocket(fdRead); FD_ZERO_ALL(); FD_SET_ALL(fdWrite); @@ -3824,7 +3733,7 @@ static void test_select(void) closesocket(fdWrite); /* Close the socket currently being selected in a thread - bug 38399 */ - ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + tcp_socketpair(&fdRead, &fdWrite); thread_handle = CreateThread(NULL, 0, SelectCloseThread, &fdWrite, 0, &id); ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); FD_ZERO_ALL(); @@ -3835,7 +3744,7 @@ static void test_select(void) WaitForSingleObject (thread_handle, 1000); closesocket(fdRead); /* test again with only the except descriptor */ - ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + tcp_socketpair(&fdRead, &fdWrite); thread_handle = CreateThread(NULL, 0, SelectCloseThread, &fdWrite, 0, &id); ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); FD_ZERO_ALL(); @@ -3892,42 +3801,20 @@ static SOCKET setup_server_socket(struct sockaddr_in *addr, int *len) SOCKET server_socket; server_socket = socket(AF_INET, SOCK_STREAM, 0); - if (server_socket == INVALID_SOCKET) - { - trace("error creating server socket: %d\n", WSAGetLastError()); - return INVALID_SOCKET; - } + ok(server_socket != INVALID_SOCKET, "failed to bind socket, error %u\n", WSAGetLastError()); val = 1; ret = setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, (char *)&val, sizeof(val)); - if (ret) - { - trace("error setting SO_REUSEADDR: %d\n", WSAGetLastError()); - closesocket(server_socket); - return INVALID_SOCKET; - } + ok(!ret, "failed to set SO_REUSEADDR, error %u\n", WSAGetLastError()); ret = bind(server_socket, (struct sockaddr *)addr, *len); - if (ret) - { - trace("error binding server socket: %d\n", WSAGetLastError()); - } + ok(!ret, "failed to bind socket, error %u\n", WSAGetLastError()); ret = getsockname(server_socket, (struct sockaddr *)addr, len); - if (ret) - { - skip("failed to lookup bind address: %d\n", WSAGetLastError()); - closesocket(server_socket); - return INVALID_SOCKET; - } + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); ret = listen(server_socket, 5); - if (ret) - { - trace("error making server socket listen: %d\n", WSAGetLastError()); - closesocket(server_socket); - return INVALID_SOCKET; - } + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); return server_socket; } @@ -3973,11 +3860,6 @@ static void test_accept(void) socklen = sizeof(address); server_socket = setup_server_socket(&address, &socklen); - if (server_socket == INVALID_SOCKET) - { - trace("error creating server socket: %d\n", WSAGetLastError()); - return; - } connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; @@ -3991,29 +3873,15 @@ static void test_accept(void) ok(accepted != INVALID_SOCKET, "Failed to accept deferred connection, error %d\n", WSAGetLastError()); server_ready = CreateEventA(NULL, TRUE, FALSE, NULL); - if (server_ready == INVALID_HANDLE_VALUE) - { - trace("error creating event: %d\n", GetLastError()); - goto done; - } thread_params.s = server_socket; thread_params.ReadKilled = FALSE; thread_handle = CreateThread(NULL, 0, AcceptKillThread, &thread_params, 0, &id); - if (thread_handle == NULL) - { - trace("error creating thread: %d\n", GetLastError()); - goto done; - } WaitForSingleObject(server_ready, INFINITE); Sleep(200); ret = closesocket(server_socket); - if (ret != 0) - { - trace("closesocket failed: %d\n", WSAGetLastError()); - goto done; - } + ok(!ret, "failed to close socket, error %u\n", WSAGetLastError()); WaitForSingleObject(thread_handle, 1000); ok(thread_params.ReadKilled, "closesocket did not wake up accept\n"); @@ -4024,7 +3892,6 @@ static void test_accept(void) socklen = sizeof(address); server_socket = setup_server_socket(&address, &socklen); - if (server_socket == INVALID_SOCKET) goto done; connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; @@ -4128,10 +3995,8 @@ static void test_extendedSocketOptions(void) BOOL bool_opt_val; LINGER linger_val; - if(WSAStartup(MAKEWORD(2,0), &wsa)){ - trace("Winsock failed: %d. Aborting test\n", WSAGetLastError()); - return; - } + ret = WSAStartup(MAKEWORD(2,0), &wsa); + ok(!ret, "failed to startup, error %u\n", WSAGetLastError()); memset(&sa, 0, sa_len); @@ -4139,18 +4004,11 @@ static void test_extendedSocketOptions(void) sa.sin_port = htons(0); sa.sin_addr.s_addr = htonl(INADDR_ANY); - if((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) == INVALID_SOCKET) { - trace("Creating the socket failed: %d\n", WSAGetLastError()); - WSACleanup(); - return; - } + sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); + ok(sock != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - if(bind(sock, (struct sockaddr *) &sa, sa_len) < 0){ - trace("Failed to bind socket: %d\n", WSAGetLastError()); - closesocket(sock); - WSACleanup(); - return; - } + ret = bind(sock, (struct sockaddr *) &sa, sa_len); + ok(!ret, "failed to bind socket, error %u\n", WSAGetLastError()); ret = getsockopt(sock, SOL_SOCKET, SO_MAX_MSG_SIZE, (char *)&optval, &optlen); @@ -4208,18 +4066,11 @@ static void test_extendedSocketOptions(void) ret, WSAGetLastError()); closesocket(sock); - if((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP)) == INVALID_SOCKET) { - trace("Creating the socket failed: %d\n", WSAGetLastError()); - WSACleanup(); - return; - } + sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP); + ok(sock != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - if(bind(sock, (struct sockaddr *) &sa, sa_len) < 0){ - trace("Failed to bind socket: %d\n", WSAGetLastError()); - closesocket(sock); - WSACleanup(); - return; - } + ret = bind(sock, (struct sockaddr *) &sa, sa_len); + ok(!ret, "failed to bind socket, error %u\n", WSAGetLastError()); ret = getsockopt(sock, SOL_SOCKET, SO_LINGER, (char *)&linger_val, &optlen); ok(ret == 0, "getsockopt failed to query SO_LINGER, return value is 0x%08x\n", ret); @@ -4246,10 +4097,8 @@ static void test_getsockname(void) int ret; struct hostent *h; - if(WSAStartup(MAKEWORD(2,0), &wsa)){ - trace("Winsock failed: %d. Aborting test\n", WSAGetLastError()); - return; - } + ret = WSAStartup(MAKEWORD(2,0), &wsa); + ok(!ret, "failed to startup, error %u\n", WSAGetLastError()); memset(&sa_set, 0, sa_set_len); @@ -4257,11 +4106,8 @@ static void test_getsockname(void) sa_set.sin_port = htons(0); sa_set.sin_addr.s_addr = htonl(INADDR_ANY); - if((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP)) == INVALID_SOCKET) { - trace("Creating the socket failed: %d\n", WSAGetLastError()); - WSACleanup(); - return; - } + sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP); + ok(sock != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); sa_get = sa_set; if (getsockname(sock, (struct sockaddr*) &sa_get, &sa_get_len) == 0) @@ -4273,19 +4119,11 @@ static void test_getsockname(void) "failed getsockname modified sockaddr when it shouldn't\n"); } - if(bind(sock, (struct sockaddr *) &sa_set, sa_set_len) < 0){ - trace("Failed to bind socket: %d\n", WSAGetLastError()); - closesocket(sock); - WSACleanup(); - return; - } + ret = bind(sock, (struct sockaddr *) &sa_set, sa_set_len); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); - if(getsockname(sock, (struct sockaddr *) &sa_get, &sa_get_len) != 0){ - trace("Failed to call getsockname: %d\n", WSAGetLastError()); - closesocket(sock); - WSACleanup(); - return; - } + ret = getsockname(sock, (struct sockaddr *) &sa_get, &sa_get_len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); ret = memcmp(sa_get.sin_zero, null_padding, 8); ok(ret == 0, "getsockname did not zero the sockaddr_in structure\n"); @@ -4868,11 +4706,6 @@ static void test_ioctlsocket(void) sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(sock != INVALID_SOCKET, "Creating the socket failed: %d\n", WSAGetLastError()); - if(sock == INVALID_SOCKET) - { - skip("Can't continue without a socket.\n"); - return; - } for(i = 0; i < ARRAY_SIZE(cmds); i++) { @@ -4946,11 +4779,6 @@ static void test_ioctlsocket(void) sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(sock != INVALID_SOCKET, "Creating the socket failed: %d\n", WSAGetLastError()); - if(sock == INVALID_SOCKET) - { - skip("Can't continue without a socket.\n"); - return; - } /* test FIONREAD with a fresh and non-connected socket */ arg = 0xdeadbeef; @@ -4976,11 +4804,7 @@ static void test_ioctlsocket(void) closesocket(sock); - if (tcp_socketpair(&src, &dst) != 0) - { - ok(0, "creating socket pair failed, skipping test\n"); - return; - } + tcp_socketpair(&src, &dst); /* test FIONREAD on TCP sockets */ optval = 0xdeadbeef; @@ -5075,11 +4899,7 @@ static void test_send(void) memset(&ov, 0, sizeof(ov)); - if (tcp_socketpair(&src, &dst) != 0) - { - ok(0, "creating socket pair failed, skipping test\n"); - return; - } + tcp_socketpair(&src, &dst); set_blocking(dst, FALSE); /* force disable buffering so we can get a pending overlapped request */ @@ -6062,11 +5882,7 @@ static void test_ipv6only(void) ok(enabled == 1, "expected 1, got %d\n", enabled); ret = bind(v6, (struct sockaddr*)&sin6, sizeof(sin6)); - if (ret) - { - skip("Could not bind IPv6 address (LastError: %d)\n", WSAGetLastError()); - goto end; - } + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); v4 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(v4 != INVALID_SOCKET, "Could not create IPv4 socket (LastError: %d)\n", WSAGetLastError()); @@ -6447,11 +6263,6 @@ static void test_WSARecv(void) HANDLE thread, event = NULL, io_port; tcp_socketpair(&src, &dest); - if (src == INVALID_SOCKET || dest == INVALID_SOCKET) - { - skip("failed to create sockets\n"); - goto end; - } memset(&ov, 0, sizeof(ov)); flags = 0; @@ -6682,11 +6493,6 @@ static void test_write_watch(void) } tcp_socketpair(&src, &dest); - if (src == INVALID_SOCKET || dest == INVALID_SOCKET) - { - skip("failed to create sockets\n"); - return; - } memset(&ov, 0, sizeof(ov)); ov.hEvent = event = CreateEventA(NULL, FALSE, FALSE, NULL); @@ -6822,7 +6628,7 @@ static void test_WSAPoll(void) if (!pWSAPoll) /* >= Vista */ { - skip("WSAPoll is unsupported, some tests will be skipped.\n"); + win_skip("WSAPoll is unsupported, some tests will be skipped.\n"); return; } @@ -6975,7 +6781,7 @@ todo_wine closesocket(fdWrite); /* Try poll() on a closed socket after connection */ - ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + tcp_socketpair(&fdRead, &fdWrite); closesocket(fdRead); POLL_CLEAR(); POLL_SET(fdWrite, POLLIN | POLLOUT); @@ -6993,7 +6799,7 @@ todo_wine closesocket(fdWrite); /* Close the socket currently being polled in a thread */ - ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + tcp_socketpair(&fdRead, &fdWrite); thread_handle = CreateThread(NULL, 0, SelectCloseThread, &fdWrite, 0, &id); ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); POLL_CLEAR(); @@ -7004,7 +6810,7 @@ todo_wine WaitForSingleObject (thread_handle, 1000); closesocket(fdRead); /* test again with less flags - behavior changes */ - ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + tcp_socketpair(&fdRead, &fdWrite); thread_handle = CreateThread(NULL, 0, SelectCloseThread, &fdWrite, 0, &id); ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); POLL_CLEAR(); @@ -7771,45 +7577,28 @@ static void test_ConnectEx(void) memset(&overlapped, 0, sizeof(overlapped)); listener = socket(AF_INET, SOCK_STREAM, 0); - if (listener == INVALID_SOCKET) { - skip("could not create listener socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(listener != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); memset(&address, 0, sizeof(address)); address.sin_family = AF_INET; address.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(listener, (struct sockaddr*)&address, sizeof(address)); - if (iret != 0) { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); addrlen = sizeof(address); iret = getsockname(listener, (struct sockaddr*)&address, &addrlen); - if (iret != 0) { - skip("failed to lookup bind address, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to get address, error %u\n", WSAGetLastError()); - if (set_blocking(listener, TRUE)) { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } + iret = set_blocking(listener, TRUE); + ok(!iret, "failed to set nonblocking, error %u\n", WSAGetLastError()); bytesReturned = 0xdeadbeef; iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectExGuid, sizeof(connectExGuid), &pConnectEx, sizeof(pConnectEx), &bytesReturned, NULL, NULL); - if (iret) { - win_skip("WSAIoctl failed to get ConnectEx with ret %d + errno %d\n", iret, WSAGetLastError()); - goto end; - } + ok(!iret, "failed to get ConnectEx, error %u\n", WSAGetLastError()); ok(bytesReturned == sizeof(pConnectEx), "expected sizeof(pConnectEx), got %u\n", bytesReturned); @@ -7820,47 +7609,22 @@ static void test_ConnectEx(void) bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "ConnectEx on a unbound socket " "returned %d + errno %d\n", bret, WSAGetLastError()); - if (bret == TRUE || WSAGetLastError() != WSAEINVAL) - { - acceptor = accept(listener, NULL, NULL); - if (acceptor != INVALID_SOCKET) { - closesocket(acceptor); - acceptor = INVALID_SOCKET; - } - - closesocket(connector); - connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } - } /* ConnectEx needs a bound socket */ memset(&conaddress, 0, sizeof(conaddress)); conaddress.sin_family = AF_INET; conaddress.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(connector, (struct sockaddr*)&conaddress, sizeof(conaddress)); - if (iret != 0) { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, NULL); ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "ConnectEx on a NULL overlapped " "returned %d + errno %d\n", bret, WSAGetLastError()); overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - if (overlapped.hEvent == NULL) { - skip("could not create event object, errno = %d\n", GetLastError()); - goto end; - } iret = listen(listener, 1); - if (iret != 0) { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to listen, error %u\n", WSAGetLastError()); bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "ConnectEx failed: " @@ -7874,24 +7638,16 @@ static void test_ConnectEx(void) closesocket(connector); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); /* ConnectEx needs a bound socket */ memset(&conaddress, 0, sizeof(conaddress)); conaddress.sin_family = AF_INET; conaddress.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(connector, (struct sockaddr*)&conaddress, sizeof(conaddress)); - if (iret != 0) { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); acceptor = accept(listener, NULL, NULL); - if (acceptor != INVALID_SOCKET) { - closesocket(acceptor); - } + ok(acceptor != INVALID_SOCKET, "failed to accept socket, error %u\n", WSAGetLastError()); buffer[0] = '1'; buffer[1] = '2'; @@ -7917,28 +7673,18 @@ static void test_ConnectEx(void) closesocket(connector); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); /* ConnectEx needs a bound socket */ memset(&conaddress, 0, sizeof(conaddress)); conaddress.sin_family = AF_INET; conaddress.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(connector, (struct sockaddr*)&conaddress, sizeof(conaddress)); - if (iret != 0) { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); - if (acceptor != INVALID_SOCKET) { - closesocket(acceptor); - acceptor = INVALID_SOCKET; - } + closesocket(acceptor); + closesocket(listener); /* Connect with error */ - closesocket(listener); - listener = INVALID_SOCKET; address.sin_port = htons(1); @@ -7952,15 +7698,8 @@ static void test_ConnectEx(void) ok(bret == FALSE && GetLastError() == ERROR_CONNECTION_REFUSED, "Connecting to a disconnected host returned error %d - %d\n", bret, WSAGetLastError()); -end: - if (overlapped.hEvent) - WSACloseEvent(overlapped.hEvent); - if (listener != INVALID_SOCKET) - closesocket(listener); - if (acceptor != INVALID_SOCKET) - closesocket(acceptor); - if (connector != INVALID_SOCKET) - closesocket(connector); + WSACloseEvent(overlapped.hEvent); + closesocket(connector); } static void test_AcceptEx(void) @@ -7987,57 +7726,34 @@ static void test_AcceptEx(void) memset(&overlapped, 0, sizeof(overlapped)); listener = socket(AF_INET, SOCK_STREAM, 0); - if (listener == INVALID_SOCKET) { - skip("could not create listener socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(listener != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); memset(&bindAddress, 0, sizeof(bindAddress)); bindAddress.sin_family = AF_INET; bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(listener, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (iret != 0) { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); socklen = sizeof(bindAddress); iret = getsockname(listener, (struct sockaddr*)&bindAddress, &socklen); - if (iret != 0) { - skip("failed to lookup bind address, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to get address, error %u\n", WSAGetLastError()); - if (set_blocking(listener, FALSE)) { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } + iret = set_blocking(listener, FALSE); + ok(!iret, "Failed to set nonblocking, error %u\n", WSAGetLastError()); iret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptExGuid, sizeof(acceptExGuid), &pAcceptEx, sizeof(pAcceptEx), &bytesReturned, NULL, NULL); - if (iret) { - skip("WSAIoctl failed to get AcceptEx with ret %d + errno %d\n", iret, WSAGetLastError()); - goto end; - } + ok(!iret, "Failed to get AcceptEx, error %u\n", WSAGetLastError()); iret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &getAcceptExGuid, sizeof(getAcceptExGuid), &pGetAcceptExSockaddrs, sizeof(pGetAcceptExSockaddrs), &bytesReturned, NULL, NULL); - if (iret) { - skip("WSAIoctl failed to get GetAcceptExSockaddrs with ret %d + errno %d\n", iret, WSAGetLastError()); - goto end; - } + ok(!iret, "Failed to get GetAcceptExSockaddrs, error %u\n", WSAGetLastError()); overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(INVALID_SOCKET, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), @@ -8057,10 +7773,7 @@ todo_wine ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); iret = listen(listener, 5); - if (iret != 0) { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to listen, error %u\n", GetLastError()); overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, INVALID_SOCKET, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), @@ -8125,10 +7838,6 @@ todo_wine "returned %d + errno %d\n", bret, WSAGetLastError()); overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - if (overlapped.hEvent == NULL) { - skip("could not create event object, errno = %d\n", GetLastError()); - goto end; - } overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, @@ -8166,10 +7875,7 @@ todo_wine /* We need to cancel this call, otherwise things fail */ closesocket(acceptor); acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); bret = CancelIo((HANDLE) listener); ok(bret, "Failed to cancel failed test. Bailing...\n"); @@ -8202,15 +7908,9 @@ todo_wine /* Test short reads */ acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, @@ -8279,30 +7979,16 @@ todo_wine /* Test CF_DEFER & AcceptEx interaction */ acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); connector2 = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector2 != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); - if (set_blocking(connector, FALSE)) { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } - - if (set_blocking(connector2, FALSE)) { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } + iret = set_blocking(connector, FALSE); + ok(!iret, "failed to set nonblocking, error %u\n", GetLastError()); + iret = set_blocking(connector2, FALSE); + ok(!iret, "failed to set nonblocking, error %u\n", GetLastError()); /* Connect socket #1 */ iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); @@ -8383,7 +8069,7 @@ todo_wine ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]); closesocket(connector); - connector = INVALID_SOCKET; + closesocket(connector2); closesocket(acceptor); /* clean up in case of failures */ @@ -8393,15 +8079,9 @@ todo_wine /* Disconnect during receive? */ acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); @@ -8426,10 +8106,7 @@ todo_wine /* Test closing with pending requests */ acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); @@ -8453,10 +8130,7 @@ todo_wine } acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); @@ -8470,17 +8144,13 @@ todo_wine closesocket(acceptor); acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); closesocket(listener); - listener = INVALID_SOCKET; dwret = WaitForSingleObject(overlapped.hEvent, 1000); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); @@ -8488,17 +8158,9 @@ todo_wine bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); ok(!bret && GetLastError() == ERROR_OPERATION_ABORTED, "GetOverlappedResult failed, error %d\n", GetLastError()); -end: - if (overlapped.hEvent) - WSACloseEvent(overlapped.hEvent); - if (listener != INVALID_SOCKET) - closesocket(listener); - if (acceptor != INVALID_SOCKET) - closesocket(acceptor); - if (connector != INVALID_SOCKET) - closesocket(connector); - if (connector2 != INVALID_SOCKET) - closesocket(connector2); + WSACloseEvent(overlapped.hEvent); + closesocket(acceptor); + closesocket(connector2); } static void test_DisconnectEx(void) @@ -8644,27 +8306,16 @@ static void test_TransmitFile(void) /* Setup sockets for testing TransmitFile */ client = socket(AF_INET, SOCK_STREAM, 0); + ok(client != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); server = socket(AF_INET, SOCK_STREAM, 0); - if (client == INVALID_SOCKET || server == INVALID_SOCKET) - { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto cleanup; - } + ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); iret = WSAIoctl(client, SIO_GET_EXTENSION_FUNCTION_POINTER, &transmitFileGuid, sizeof(transmitFileGuid), &pTransmitFile, sizeof(pTransmitFile), &num_bytes, NULL, NULL); - if (iret) - { - skip("WSAIoctl failed to get TransmitFile with ret %d + errno %d\n", iret, WSAGetLastError()); - goto cleanup; - } + ok(!iret, "failed to get TransmitFile, error %u\n", GetLastError()); GetSystemWindowsDirectoryA(system_ini_path, MAX_PATH ); strcat(system_ini_path, "\\system.ini"); file = CreateFileA(system_ini_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0x0, NULL); - if (file == INVALID_HANDLE_VALUE) - { - skip("Unable to open a file to transmit.\n"); - goto cleanup; - } + ok(file != INVALID_HANDLE_VALUE, "failed to open file, error %u\n", GetLastError()); file_size = GetFileSize(file, NULL); /* Test TransmitFile with an invalid socket */ @@ -8685,35 +8336,16 @@ static void test_TransmitFile(void) bindAddress.sin_port = htons(SERVERPORT+1); bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(server, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (iret != 0) - { - skip("failed to bind(), error %d\n", WSAGetLastError()); - goto cleanup; - } + ok(!iret, "failed to bind socket, error %u\n", GetLastError()); iret = listen(server, 1); - if (iret != 0) - { - skip("failed to listen(), error %d\n", WSAGetLastError()); - goto cleanup; - } + ok(!iret, "failed to listen, error %u\n", GetLastError()); iret = connect(client, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (iret != 0) - { - skip("failed to connect(), error %d\n", WSAGetLastError()); - goto cleanup; - } + ok(!iret, "failed to connect, error %u\n", GetLastError()); len = sizeof(bindAddress); dest = accept(server, (struct sockaddr*)&bindAddress, &len); - if (dest == INVALID_SOCKET) - { - skip("failed to accept(), error %d\n", WSAGetLastError()); - goto cleanup; - } - if (set_blocking(dest, FALSE)) - { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto cleanup; - } + ok(dest != INVALID_SOCKET, "failed to accept, error %u\n", GetLastError()); + iret = set_blocking(dest, FALSE); + ok(!iret, "failed to set nonblocking, error %u\n", GetLastError()); /* Test TransmitFile with no possible buffer */ bret = pTransmitFile(client, NULL, 0, 0, NULL, NULL, 0); @@ -8759,12 +8391,6 @@ static void test_TransmitFile(void) /* Test overlapped TransmitFile */ ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (ov.hEvent == INVALID_HANDLE_VALUE) - { - skip("Could not create event object, some tests will be skipped. errno = %d\n", - GetLastError()); - goto cleanup; - } SetFilePointer(file, 0, NULL, FILE_BEGIN); bret = pTransmitFile(client, file, 0, 0, &ov, NULL, 0); err = WSAGetLastError(); @@ -8781,11 +8407,6 @@ static void test_TransmitFile(void) /* Test overlapped TransmitFile w/ start offset */ ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (ov.hEvent == INVALID_HANDLE_VALUE) - { - skip("Could not create event object, some tests will be skipped. errno = %d\n", GetLastError()); - goto cleanup; - } SetFilePointer(file, 0, NULL, FILE_BEGIN); ov.Offset = 10; bret = pTransmitFile(client, file, 0, 0, &ov, NULL, 0); @@ -8802,11 +8423,6 @@ static void test_TransmitFile(void) /* Test overlapped TransmitFile w/ file and buffer data */ ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (ov.hEvent == INVALID_HANDLE_VALUE) - { - skip("Could not create event object, some tests will be skipped. errno = %d\n", GetLastError()); - goto cleanup; - } buffers.Head = &header_msg[0]; buffers.HeadLength = sizeof(header_msg); buffers.Tail = &footer_msg[0]; @@ -8839,7 +8455,6 @@ static void test_TransmitFile(void) ok(!bret, "TransmitFile succeeded unexpectedly.\n"); ok(err == WSAENOTCONN, "TransmitFile triggered unexpected errno (%d != %d)\n", err, WSAENOTCONN); -cleanup: CloseHandle(file); CloseHandle(ov.hEvent); closesocket(client); @@ -8863,11 +8478,6 @@ static void test_getpeername(void) sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); ok(sock != INVALID_SOCKET, "Expected socket to return a valid socket\n"); - if (sock == INVALID_SOCKET) - { - skip("Socket creation failed with %d\n", WSAGetLastError()); - return; - } ret = getpeername(sock, NULL, NULL); ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); @@ -8945,11 +8555,6 @@ static void test_sioRoutingInterfaceQuery(void) sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); ok(sock != INVALID_SOCKET, "Expected socket to return a valid socket\n"); - if (sock == INVALID_SOCKET) - { - skip("Socket creation failed with %d\n", WSAGetLastError()); - return; - } ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, NULL, 0, NULL, 0, NULL, NULL, NULL); ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, @@ -9001,12 +8606,7 @@ static void test_sioAddressListChange(void) /* Use gethostbyname to find the list of local network interfaces */ h = gethostbyname(""); - if (!h) - { - skip("Cannot test SIO_ADDRESS_LIST_CHANGE, gethostbyname failed with %u\n", - WSAGetLastError()); - return; - } + ok(!!h, "failed to get interface list, error %u\n", WSAGetLastError()); for (acount = 0; h->h_addr_list[acount]; acount++); if (acount == 0) { @@ -9369,51 +8969,29 @@ static void test_WSAAsyncGetServByName(void) */ static SOCKET setup_iocp_src(struct sockaddr_in *bindAddress) { - SOCKET src, ret = INVALID_SOCKET; + SOCKET src; int iret, socklen; src = socket(AF_INET, SOCK_STREAM, 0); - if (src == INVALID_SOCKET) - { - skip("could not create listener socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(src != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); memset(bindAddress, 0, sizeof(*bindAddress)); bindAddress->sin_family = AF_INET; bindAddress->sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(src, (struct sockaddr*)bindAddress, sizeof(*bindAddress)); - if (iret != 0) - { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); socklen = sizeof(*bindAddress); iret = getsockname(src, (struct sockaddr*)bindAddress, &socklen); - if (iret != 0) { - skip("failed to lookup bind address, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to get address, error %u\n", WSAGetLastError()); - if (set_blocking(src, FALSE)) - { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } + iret = set_blocking(src, FALSE); + ok(!iret, "failed to make socket non-blocking, error %u\n", WSAGetLastError()); iret = listen(src, 5); - if (iret != 0) - { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to listen, error %u\n", WSAGetLastError()); - ret = src; -end: - if (src != ret && ret == INVALID_SOCKET) - closesocket(src); - return ret; + return src; } static void test_completion_port(void) @@ -9441,11 +9019,6 @@ static void test_completion_port(void) memset(&ov, 0, sizeof(ov)); tcp_socketpair(&src, &dest); - if (src == INVALID_SOCKET || dest == INVALID_SOCKET) - { - skip("failed to create sockets\n"); - goto end; - } bufs.len = sizeof(buf); bufs.buf = buf; @@ -9500,11 +9073,6 @@ static void test_completion_port(void) memset(&ov, 0, sizeof(ov)); tcp_socketpair(&src, &dest); - if (src == INVALID_SOCKET || dest == INVALID_SOCKET) - { - skip("failed to create sockets\n"); - goto end; - } bufs.len = sizeof(buf); bufs.buf = buf; @@ -9550,11 +9118,6 @@ static void test_completion_port(void) /* Test IOCP response on successful immediate read. */ tcp_socketpair(&src, &dest); - if (src == INVALID_SOCKET || dest == INVALID_SOCKET) - { - skip("failed to create sockets\n"); - goto end; - } bufs.len = sizeof(buf); bufs.buf = buf; @@ -9627,11 +9190,6 @@ static void test_completion_port(void) /* Test IOCP response on hard shutdown. This was the condition that triggered * a crash in an actual app (bug 38980). */ tcp_socketpair(&src, &dest); - if (src == INVALID_SOCKET || dest == INVALID_SOCKET) - { - skip("failed to create sockets\n"); - goto end; - } bufs.len = sizeof(buf); bufs.buf = buf; @@ -9710,24 +9268,15 @@ static void test_completion_port(void) closesocket(dest); dest = socket(AF_INET, SOCK_STREAM, 0); - if (dest == INVALID_SOCKET) - { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(dest != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); iret = WSAIoctl(dest, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptExGuid, sizeof(acceptExGuid), &pAcceptEx, sizeof(pAcceptEx), &num_bytes, NULL, NULL); - if (iret) - { - skip("WSAIoctl failed to get AcceptEx with ret %d + errno %d\n", iret, WSAGetLastError()); - goto end; - } + ok(!iret, "failed to get AcceptEx, error %u\n", WSAGetLastError()); /* Test IOCP response on socket close (IOCP created after AcceptEx) */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); SetLastError(0xdeadbeef); @@ -9769,8 +9318,7 @@ static void test_completion_port(void) /* Test IOCP response on socket close (IOCP created before AcceptEx) */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); SetLastError(0xdeadbeef); @@ -9812,8 +9360,7 @@ static void test_completion_port(void) /* Test IOCP with duplicated handle */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); SetLastError(0xdeadbeef); @@ -9871,8 +9418,7 @@ static void test_completion_port(void) /* Test IOCP with duplicated handle (closing duplicated handle) */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); SetLastError(0xdeadbeef); @@ -9938,8 +9484,7 @@ static void test_completion_port(void) /* Test IOCP with duplicated handle (closing original handle) */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); SetLastError(0xdeadbeef); @@ -9994,8 +9539,7 @@ static void test_completion_port(void) /* Test IOCP without AcceptEx */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); SetLastError(0xdeadbeef); @@ -10018,14 +9562,10 @@ static void test_completion_port(void) /* */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); @@ -10076,21 +9616,13 @@ static void test_completion_port(void) /* */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); dest = socket(AF_INET, SOCK_STREAM, 0); - if (dest == INVALID_SOCKET) - { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(dest != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); @@ -10146,21 +9678,13 @@ static void test_completion_port(void) /* */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); dest = socket(AF_INET, SOCK_STREAM, 0); - if (dest == INVALID_SOCKET) - { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(dest != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); @@ -10178,7 +9702,6 @@ static void test_completion_port(void) ok(iret == 0, "connecting to accepting socket failed, error %d\n", GetLastError()); closesocket(dest); - dest = INVALID_SOCKET; SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -10213,13 +9736,8 @@ static void test_completion_port(void) ok(!olp, "Overlapped structure is at %p\n", olp); - end: - if (dest != INVALID_SOCKET) - closesocket(dest); - if (src != INVALID_SOCKET) - closesocket(src); - if (connector != INVALID_SOCKET) - closesocket(connector); + closesocket(src); + closesocket(connector); CloseHandle(previous_port); } @@ -10530,11 +10048,6 @@ todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); name = HeapAlloc(GetProcessHeap(), 0, blen); - if (!name) - { - skip("Failed to alloc memory\n"); - return; - } ret = pWSAEnumNameSpaceProvidersA(&blen, name); todo_wine @@ -10607,11 +10120,6 @@ todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); name = HeapAlloc(GetProcessHeap(), 0, blen); - if (!name) - { - skip("Failed to alloc memory\n"); - return; - } ret = pWSAEnumNameSpaceProvidersW(&blen, name); todo_wine @@ -11243,36 +10751,31 @@ static void iocp_async_read_thread(SOCKET src, SOCKET dst) static void test_iocp(void) { SOCKET src, dst; - int i, ret; + int i; - ret = tcp_socketpair_ovl(&src, &dst); - ok(!ret, "creating socket pair failed\n"); + tcp_socketpair_ovl(&src, &dst); sync_read(src, dst); iocp_async_read(src, dst); closesocket(src); closesocket(dst); - ret = tcp_socketpair_ovl(&src, &dst); - ok(!ret, "creating socket pair failed\n"); + tcp_socketpair_ovl(&src, &dst); iocp_async_read_thread(src, dst); closesocket(src); closesocket(dst); for (i = 0; i <= 2; i++) { - ret = tcp_socketpair_ovl(&src, &dst); - ok(!ret, "creating socket pair failed\n"); + tcp_socketpair_ovl(&src, &dst); iocp_async_read_closesocket(src, i); closesocket(dst); } - ret = tcp_socketpair_ovl(&src, &dst); - ok(!ret, "creating socket pair failed\n"); + tcp_socketpair_ovl(&src, &dst); iocp_async_closesocket(src); closesocket(dst); - ret = tcp_socketpair_ovl(&src, &dst); - ok(!ret, "creating socket pair failed\n"); + tcp_socketpair_ovl(&src, &dst); iocp_async_read_thread_closesocket(src); closesocket(dst); } -- 2.28.0

2 6

[PATCH] schtasks: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/schtasks/schtasks.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 2ffc241153d..ae28f30ad48 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -25,16 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(schtasks); -static const WCHAR change_optW[] = {'/','c','h','a','n','g','e',0}; -static const WCHAR create_optW[] = {'/','c','r','e','a','t','e',0}; -static const WCHAR delete_optW[] = {'/','d','e','l','e','t','e',0}; -static const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; -static const WCHAR f_optW[] = {'/','f',0}; -static const WCHAR ru_optW[] = {'/','r','u',0}; -static const WCHAR tn_optW[] = {'/','t','n',0}; -static const WCHAR tr_optW[] = {'/','t','r',0}; -static const WCHAR xml_optW[] = {'/','x','m','l',0}; - static ITaskFolder *get_tasks_root_folder(void) { ITaskService *service; @@ -140,7 +130,7 @@ static int change_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if(!wcsicmp(argv[0], tn_optW)) { + if (!wcsicmp(argv[0], L"/tn")) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -154,12 +144,12 @@ static int change_command(int argc, WCHAR *argv[]) task_name = argv[1]; argc -= 2; argv += 2; - }else if (!wcsicmp(argv[0], enable_optW)) { + } else if (!wcsicmp(argv[0], L"/enable")) { enable = TRUE; have_option = TRUE; argc--; argv++; - }else if (!wcsicmp(argv[0], tr_optW)) { + } else if (!wcsicmp(argv[0], L"/tr")) { if (argc < 2) { FIXME("Missing /tr value\n"); return 1; @@ -213,7 +203,7 @@ static int create_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if (!wcsicmp(argv[0], xml_optW)) { + if (!wcsicmp(argv[0], L"/xml")) { if (argc < 2) { FIXME("Missing /xml value\n"); return 1; @@ -227,7 +217,7 @@ static int create_command(int argc, WCHAR *argv[]) xml_file = argv[1]; argc -= 2; argv += 2; - }else if(!wcsicmp(argv[0], tn_optW)) { + } else if (!wcsicmp(argv[0], L"/tn")) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -241,11 +231,11 @@ static int create_command(int argc, WCHAR *argv[]) task_name = argv[1]; argc -= 2; argv += 2; - }else if(!wcsicmp(argv[0], f_optW)) { + } else if (!wcsicmp(argv[0], L"/f")) { flags = TASK_CREATE_OR_UPDATE; argc--; argv++; - }else if (!wcsicmp(argv[0], ru_optW)) { + } else if (!wcsicmp(argv[0], L"/ru")) { if (argc < 2) { FIXME("Missing /ru value\n"); return 1; @@ -302,11 +292,11 @@ static int delete_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if (!wcsicmp(argv[0], f_optW)) { + if (!wcsicmp(argv[0], L"/f")) { TRACE("force opt\n"); argc--; argv++; - }else if(!wcsicmp(argv[0], tn_optW)) { + } else if (!wcsicmp(argv[0], L"/tn")) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -357,11 +347,11 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (argc < 2) FIXME("Print current tasks state\n"); - else if (!wcsicmp(argv[1], change_optW)) + else if (!wcsicmp(argv[1], L"/change")) ret = change_command(argc - 2, argv + 2); - else if (!wcsicmp(argv[1], create_optW)) + else if (!wcsicmp(argv[1], L"/create")) ret = create_command(argc - 2, argv + 2); - else if (!wcsicmp(argv[1], delete_optW)) + else if (!wcsicmp(argv[1], L"/delete")) ret = delete_command(argc - 2, argv + 2); else FIXME("Unsupported command %s\n", debugstr_w(argv[1])); -- 2.26.2

1 0

[PATCH] net: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/net/net.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 0f43e8a973d..dbc4bf2bfc6 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -155,7 +155,6 @@ static BOOL net_use(int argc, const WCHAR* argv[]) static BOOL net_enum_services(void) { - static const WCHAR runningW[]={' ',' ',' ',' ','%','1','\n',0}; SC_HANDLE SCManager; LPENUM_SERVICE_STATUS_PROCESSW services; DWORD size, i, count, resume; @@ -184,7 +183,7 @@ static BOOL net_enum_services(void) output_string(STRING_RUNNING_HEADER); for(i = 0; i < count; i++) { - output_printf(runningW, services[i].lpDisplayName); + output_printf(L" %1\n", services[i].lpDisplayName); WINE_TRACE("service=%s state=%d controls=%x\n", wine_dbgstr_w(services[i].lpServiceName), services[i].ServiceStatusProcess.dwCurrentState, @@ -295,19 +294,13 @@ static BOOL arg_is(const WCHAR* str1, const WCHAR* str2) int __cdecl wmain(int argc, const WCHAR* argv[]) { - static const WCHAR helpW[]={'h','e','l','p',0}; - static const WCHAR shelpW[]={'/','h','e','l','p',0}; - static const WCHAR startW[]={'s','t','a','r','t',0}; - static const WCHAR stopW[]={'s','t','o','p',0}; - static const WCHAR useW[]={'u','s','e',0}; - if (argc < 2) { output_string(STRING_USAGE); return 1; } - if(arg_is(argv[1], helpW)) + if(arg_is(argv[1], L"help")) { if(argc > 3) { @@ -316,14 +309,14 @@ int __cdecl wmain(int argc, const WCHAR* argv[]) } if(argc == 2) output_string(STRING_USAGE); - else if(arg_is(argv[2], startW)) + else if(arg_is(argv[2], L"start")) output_string(STRING_START_USAGE); - else if(arg_is(argv[2], stopW)) + else if(arg_is(argv[2], L"stop")) output_string(STRING_STOP_USAGE); else output_string(STRING_USAGE); } - else if(arg_is(argv[1], startW)) + else if(arg_is(argv[1], L"start")) { if(argc > 3) { @@ -335,24 +328,24 @@ int __cdecl wmain(int argc, const WCHAR* argv[]) if (!net_enum_services()) return 1; } - else if(arg_is(argv[2], shelpW)) + else if(arg_is(argv[2], L"/help")) output_string(STRING_START_USAGE); else if(!net_service(NET_START, argv[2])) return 1; } - else if(arg_is(argv[1], stopW)) + else if(arg_is(argv[1], L"stop")) { if(argc != 3) { output_string(STRING_STOP_USAGE); return 1; } - if(arg_is(argv[2], shelpW)) + if(arg_is(argv[2], L"/help")) output_string(STRING_STOP_USAGE); else if(!net_service(NET_STOP, argv[2])) return 1; } - else if(arg_is(argv[1], useW)) + else if(arg_is(argv[1], L"use")) { if(!net_use(argc, argv)) return 1; } -- 2.26.2

1 0

[PATCH] hostname: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/hostname/hostname.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index 0738e718e11..e6c2ed76cd1 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -91,18 +91,15 @@ static int WINAPIV hostname_message_printfW(int msg, ...) static int hostname_message(int msg) { - static const WCHAR formatW[] = {'%','s',0}; WCHAR msg_buffer[8192]; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - return hostname_printfW(formatW, msg_buffer); + return hostname_printfW(L"%s", msg_buffer); } static int display_computer_name(void) { - static const WCHAR fmtW[] = {'%','s','\r','\n',0}; - WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; DWORD size = ARRAY_SIZE(name); BOOL ret; @@ -114,7 +111,7 @@ static int display_computer_name(void) return 1; } - hostname_printfW(fmtW, name); + hostname_printfW(L"%s\r\n", name); return 0; } @@ -122,11 +119,9 @@ int __cdecl wmain(int argc, WCHAR *argv[]) { if (argc > 1) { - static const WCHAR slashHelpW[] = {'/','?',0}; - unsigned int i; - if (!wcsncmp(argv[1], slashHelpW, ARRAY_SIZE(slashHelpW) - 1)) + if (!wcsncmp(argv[1], L"/?", ARRAY_SIZE(L"/?") - 1)) { hostname_message(STRING_USAGE); return 1; -- 2.26.2

1 0

[PATCH] extrac32: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/extrac32/extrac32.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index c557ff0733f..278f8ff9bf5 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -115,11 +115,9 @@ static void copy_file(LPCWSTR source, LPCWSTR destination) if (PathFileExistsW(destination) && !force_mode) { - static const WCHAR overwriteMsg[] = {'O','v','e','r','w','r','i','t','e',' ','"','%','s','"','?',0}; - static const WCHAR titleMsg[] = {'E','x','t','r','a','c','t',0}; WCHAR msg[MAX_PATH+100]; - swprintf(msg, ARRAY_SIZE(msg), overwriteMsg, destination); - if (MessageBoxW(NULL, msg, titleMsg, MB_YESNO | MB_ICONWARNING) != IDYES) + swprintf(msg, ARRAY_SIZE(msg), L"Overwrite \"%s\"?", destination); + if (MessageBoxW(NULL, msg, L"Extract", MB_YESNO | MB_ICONWARNING) != IDYES) return; } -- 2.26.2

1 0

[PATCH] dxdiag: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/dxdiag/information.c | 59 ++++++++++-------------------- programs/dxdiag/main.c | 13 ++----- programs/dxdiag/output.c | 69 +++++++++++------------------------ 3 files changed, 45 insertions(+), 96 deletions(-) diff --git a/programs/dxdiag/information.c b/programs/dxdiag/information.c index e30aa891dbe..74fe15f7aec 100644 --- a/programs/dxdiag/information.c +++ b/programs/dxdiag/information.c @@ -27,25 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); -static const WCHAR szTimeEnglish[] = {'s','z','T','i','m','e','E','n','g','l','i','s','h',0}; -static const WCHAR szTimeLocalized[] = {'s','z','T','i','m','e','L','o','c','a','l','i','z','e','d',0}; -static const WCHAR szMachineNameEnglish[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','E','n','g','l','i','s','h',0}; -static const WCHAR szOSExLongEnglish[] = {'s','z','O','S','E','x','L','o','n','g','E','n','g','l','i','s','h',0}; -static const WCHAR szOSExLocalized[] = {'s','z','O','S','E','x','L','o','c','a','l','i','z','e','d',0}; -static const WCHAR szLanguagesEnglish[] = {'s','z','L','a','n','g','u','a','g','e','s','E','n','g','l','i','s','h',0}; -static const WCHAR szLanguagesLocalized[] = {'s','z','L','a','n','g','u','a','g','e','s','L','o','c','a','l','i','z','e','d',0}; -static const WCHAR szSystemManufacturerEnglish[] = {'s','z','S','y','s','t','e','m','M','a','n','u','f','a','c','t','u','r','e','r','E','n','g','l','i','s','h',0}; -static const WCHAR szSystemModelEnglish[] = {'s','z','S','y','s','t','e','m','M','o','d','e','l','E','n','g','l','i','s','h',0}; -static const WCHAR szBIOSEnglish[] = {'s','z','B','I','O','S','E','n','g','l','i','s','h',0}; -static const WCHAR szProcessorEnglish[] = {'s','z','P','r','o','c','e','s','s','o','r','E','n','g','l','i','s','h',0}; -static const WCHAR szPhysicalMemoryEnglish[] = {'s','z','P','h','y','s','i','c','a','l','M','e','m','o','r','y','E','n','g','l','i','s','h',0}; -static const WCHAR szPageFileEnglish[] = {'s','z','P','a','g','e','F','i','l','e','E','n','g','l','i','s','h',0}; -static const WCHAR szPageFileLocalized[] = {'s','z','P','a','g','e','F','i','l','e','L','o','c','a','l','i','z','e','d',0}; -static const WCHAR szWindowsDir[] = {'s','z','W','i','n','d','o','w','s','D','i','r',0}; -static const WCHAR szDirectXVersionLongEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','o','n','g','E','n','g','l','i','s','h',0}; -static const WCHAR szSetupParamEnglish[] = {'s','z','S','e','t','u','p','P','a','r','a','m','E','n','g','l','i','s','h',0}; -static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0}; - struct property_list { const WCHAR *property_name; @@ -108,41 +89,41 @@ static inline void fill_system_property_list(struct dxdiag_information *dxdiag_i { struct system_information *system_info = &dxdiag_info->system_info; - list[0].property_name = szTimeEnglish; + list[0].property_name = L"szTimeEnglish"; list[0].output = &system_info->szTimeEnglish; - list[1].property_name = szTimeLocalized; + list[1].property_name = L"szTimeLocalized"; list[1].output = &system_info->szTimeLocalized; - list[2].property_name = szMachineNameEnglish; + list[2].property_name = L"szMachineNameEnglish"; list[2].output = &system_info->szMachineNameEnglish; - list[3].property_name = szOSExLongEnglish; + list[3].property_name = L"szOSExLongEnglish"; list[3].output = &system_info->szOSExLongEnglish; - list[4].property_name = szOSExLocalized; + list[4].property_name = L"szOSExLocalized"; list[4].output = &system_info->szOSExLocalized; - list[5].property_name = szLanguagesEnglish; + list[5].property_name = L"szLanguagesEnglish"; list[5].output = &system_info->szLanguagesEnglish; - list[6].property_name = szLanguagesLocalized; + list[6].property_name = L"szLanguagesLocalized"; list[6].output = &system_info->szLanguagesLocalized; - list[7].property_name = szSystemManufacturerEnglish; + list[7].property_name = L"szSystemManufacturerEnglish"; list[7].output = &system_info->szSystemManufacturerEnglish; - list[8].property_name = szSystemModelEnglish; + list[8].property_name = L"szSystemModelEnglish"; list[8].output = &system_info->szSystemModelEnglish; - list[9].property_name = szBIOSEnglish; + list[9].property_name = L"szBIOSEnglish"; list[9].output = &system_info->szBIOSEnglish; - list[10].property_name = szProcessorEnglish; + list[10].property_name = L"szProcessorEnglish"; list[10].output = &system_info->szProcessorEnglish; - list[11].property_name = szPhysicalMemoryEnglish; + list[11].property_name = L"szPhysicalMemoryEnglish"; list[11].output = &system_info->szPhysicalMemoryEnglish; - list[12].property_name = szPageFileEnglish; + list[12].property_name = L"szPageFileEnglish"; list[12].output = &system_info->szPageFileEnglish; - list[13].property_name = szPageFileLocalized; + list[13].property_name = L"szPageFileLocalized"; list[13].output = &system_info->szPageFileLocalized; - list[14].property_name = szWindowsDir; + list[14].property_name = L"szWindowsDir"; list[14].output = &system_info->szWindowsDir; - list[15].property_name = szDirectXVersionLongEnglish; + list[15].property_name = L"szDirectXVersionLongEnglish"; list[15].output = &system_info->szDirectXVersionLongEnglish; - list[16].property_name = szSetupParamEnglish; + list[16].property_name = L"szSetupParamEnglish"; list[16].output = &system_info->szSetupParamEnglish; - list[17].property_name = szDxDiagVersion; + list[17].property_name = L"szDxDiagVersion"; list[17].output = &system_info->szDxDiagVersion; } @@ -172,8 +153,6 @@ static BOOL fill_system_information(IDxDiagContainer *container, struct dxdiag_i return TRUE; } -static const WCHAR DxDiag_SystemInfo[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','I','n','f','o',0}; - static const struct information_fillers { const WCHAR *child_container_name; @@ -181,7 +160,7 @@ static const struct information_fillers void (*free_function)(struct dxdiag_information *); } filler_list[] = { - {DxDiag_SystemInfo, fill_system_information, free_system_information}, + {L"DxDiag_SystemInfo", fill_system_information, free_system_information}, }; void free_dxdiag_information(struct dxdiag_information *system_info) diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index 4533236f0f5..968d84adea1 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -105,11 +105,6 @@ static BOOL process_file_name(const WCHAR *cmdline, enum output_type output_type static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info *info) { - static const WCHAR whql_colonW[] = {'w','h','q','l',':',0}; - static const WCHAR offW[] = {'o','f','f',0}; - static const WCHAR onW[] = {'o','n',0}; - static const WCHAR dontskipW[] = {'d','o','n','t','s','k','i','p',0}; - info->whql_check = FALSE; info->output_type = OUTPUT_NONE; @@ -143,17 +138,17 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info ARRAY_SIZE(info->outfile)); case 'W': case 'w': - if (wcsnicmp(cmdline, whql_colonW, 5)) + if (wcsnicmp(cmdline, L"whql:", 5)) return FALSE; cmdline += 5; - if (!wcsnicmp(cmdline, offW, 3)) + if (!wcsnicmp(cmdline, L"off", 3)) { info->whql_check = FALSE; cmdline += 2; } - else if (!wcsnicmp(cmdline, onW, 2)) + else if (!wcsnicmp(cmdline, L"on", 2)) { info->whql_check = TRUE; cmdline++; @@ -165,7 +160,7 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info case 'd': case 'D': - if (wcsnicmp(cmdline, dontskipW, 8)) + if (wcsnicmp(cmdline, L"dontskip", 8)) return FALSE; cmdline += 8; break; diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index 50240fb2860..95941785c1c 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -33,26 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); static char output_buffer[1024]; static const char crlf[2] = "\r\n"; -static const WCHAR DxDiag[] = {'D','x','D','i','a','g',0}; - -static const WCHAR SystemInformation[] = {'S','y','s','t','e','m','I','n','f','o','r','m','a','t','i','o','n',0}; -static const WCHAR Time[] = {'T','i','m','e',0}; -static const WCHAR MachineName[] = {'M','a','c','h','i','n','e','N','a','m','e',0}; -static const WCHAR OperatingSystem[] = {'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR Language[] = {'L','a','n','g','u','a','g','e',0}; -static const WCHAR SystemManufacturer[] = {'S','y','s','t','e','m','M','a','n','u','f','a','c','t','u','r','e','r',0}; -static const WCHAR SystemModel[] = {'S','y','s','t','e','m','M','o','d','e','l',0}; -static const WCHAR BIOS[] = {'B','I','O','S',0}; -static const WCHAR Processor[] = {'P','r','o','c','e','s','s','o','r',0}; -static const WCHAR Memory[] = {'M','e','m','o','r','y',0}; -static const WCHAR PageFile[] = {'P','a','g','e','F','i','l','e',0}; -static const WCHAR WindowsDir[] = {'W','i','n','d','o','w','s','D','i','r',0}; -static const WCHAR DirectXVersion[] = {'D','i','r','e','c','t','X','V','e','r','s','i','o','n',0}; -static const WCHAR DXSetupParameters[] = {'D','X','S','e','t','u','p','P','a','r','a','m','e','t','e','r','s',0}; -static const WCHAR DxDiagVersion[] = {'D','x','D','i','a','g','V','e','r','s','i','o','n',0}; -static const WCHAR DxDiagUnicode[] = {'D','x','D','i','a','g','U','n','i','c','o','d','e',0}; -static const WCHAR DxDiag64Bit[] = {'D','x','D','i','a','g','6','4','B','i','t',0}; - struct text_information_field { const char *field_name; @@ -241,41 +221,38 @@ static HRESULT save_xml_document(IXMLDOMDocument *xmldoc, const WCHAR *filename) static inline void fill_system_xml_output_table(struct dxdiag_information *dxdiag_info, struct xml_information_field *fields) { - static const WCHAR zeroW[] = {'0',0}; - static const WCHAR oneW[] = {'1',0}; - - fields[0].tag_name = Time; + fields[0].tag_name = L"Time"; fields[0].value = dxdiag_info->system_info.szTimeEnglish; - fields[1].tag_name = MachineName; + fields[1].tag_name = L"MachineName"; fields[1].value = dxdiag_info->system_info.szMachineNameEnglish; - fields[2].tag_name = OperatingSystem; + fields[2].tag_name = L"OperatingSystem"; fields[2].value = dxdiag_info->system_info.szOSExLongEnglish; - fields[3].tag_name = Language; + fields[3].tag_name = L"Language"; fields[3].value = dxdiag_info->system_info.szLanguagesEnglish; - fields[4].tag_name = SystemManufacturer; + fields[4].tag_name = L"SystemManufacturer"; fields[4].value = dxdiag_info->system_info.szSystemManufacturerEnglish; - fields[5].tag_name = SystemModel; + fields[5].tag_name = L"SystemModel"; fields[5].value = dxdiag_info->system_info.szSystemModelEnglish; - fields[6].tag_name = BIOS; + fields[6].tag_name = L"BIOS"; fields[6].value = dxdiag_info->system_info.szBIOSEnglish; - fields[7].tag_name = Processor; + fields[7].tag_name = L"Processor"; fields[7].value = dxdiag_info->system_info.szProcessorEnglish; - fields[8].tag_name = Memory; + fields[8].tag_name = L"Memory"; fields[8].value = dxdiag_info->system_info.szPhysicalMemoryEnglish; - fields[9].tag_name = PageFile; + fields[9].tag_name = L"PageFile"; fields[9].value = dxdiag_info->system_info.szPageFileEnglish; - fields[10].tag_name = WindowsDir; + fields[10].tag_name = L"WindowsDir"; fields[10].value = dxdiag_info->system_info.szWindowsDir; - fields[11].tag_name = DirectXVersion; + fields[11].tag_name = L"DirectXVersion"; fields[11].value = dxdiag_info->system_info.szDirectXVersionLongEnglish; - fields[12].tag_name = DXSetupParameters; + fields[12].tag_name = L"DXSetupParameters"; fields[12].value = dxdiag_info->system_info.szSetupParamEnglish; - fields[13].tag_name = DxDiagVersion; + fields[13].tag_name = L"DxDiagVersion"; fields[13].value = dxdiag_info->system_info.szDxDiagVersion; - fields[14].tag_name = DxDiagUnicode; - fields[14].value = oneW; - fields[15].tag_name = DxDiag64Bit; - fields[15].value = dxdiag_info->system_info.win64 ? oneW : zeroW; + fields[14].tag_name = L"DxDiagUnicode"; + fields[14].value = L"1"; + fields[15].tag_name = L"DxDiag64Bit"; + fields[15].value = dxdiag_info->system_info.win64 ? L"1" : L"0"; } static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename) @@ -286,7 +263,7 @@ static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const struct xml_information_field fields[50]; } output_table[] = { - {SystemInformation}, + {L"SystemInformation"}, }; IXMLDOMDocument *xmldoc = NULL; @@ -304,7 +281,7 @@ static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const goto error; } - if (!(dxdiag_element = xml_create_element(xmldoc, DxDiag))) + if (!(dxdiag_element = xml_create_element(xmldoc, L"DxDiag"))) goto error; hr = IXMLDOMDocument_appendChild(xmldoc, (IXMLDOMNode *)dxdiag_element, NULL); @@ -380,13 +357,11 @@ static struct output_backend { /* OUTPUT_TEXT */ { - {'.','t','x','t',0}, - output_text_information, + L".txt", output_text_information, }, /* OUTPUT_XML */ { - {'.','x','m','l',0}, - output_xml_information, + L".xml", output_xml_information, }, }; -- 2.26.2

1 0

[PATCH] control: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/control/control.c | 52 ++++++++++++-------------------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/programs/control/control.c b/programs/control/control.c index 9f9005f7488..df23016bce3 100644 --- a/programs/control/control.c +++ b/programs/control/control.c @@ -26,26 +26,6 @@ #include <windows.h> #include <shellapi.h> -/* alphabetical list of recognized optional command line parameters */ -static const WCHAR szP_COLOR[] = {'C','O','L','O','R',0}; -static const WCHAR szP_DATETIME[] = {'D','A','T','E','/','T','I','M','E',0}; -static const WCHAR szP_DESKTOP[] = {'D','E','S','K','T','O','P',0}; -static const WCHAR szP_INTERNATIONAL[] = {'I','N','T','E','R','N','A','T','I','O','N','A','L',0}; -static const WCHAR szP_KEYBOARD[] = {'K','E','Y','B','O','A','R','D',0}; -static const WCHAR szP_MOUSE[] = {'M','O','U','S','E',0}; -static const WCHAR szP_PORTS[] = {'P','O','R','T','S',0}; -static const WCHAR szP_PRINTERS [] = {'P','R','I','N','T','E','R','S',0}; - -/* alphabetical list of appropriate commands to execute */ -static const WCHAR szC_COLOR[] = {'d','e','s','k','.','c','p','l',',',',','2',0}; -static const WCHAR szC_DATETIME[] = {'t','i','m','e','d','a','t','e','.','c','p','l',0}; -static const WCHAR szC_DESKTOP[] = {'d','e','s','k','.','c','p','l',0}; -static const WCHAR szC_INTERNATIONAL[] = {'i','n','t','l','.','c','p','l',0}; -static const WCHAR szC_KEYBOARD[] = {'m','a','i','n','.','c','p','l',' ','@','1',0}; -static const WCHAR szC_MOUSE[] = {'m','a','i','n','.','c','p','l',0}; -static const WCHAR szC_PORTS[] = {'s','y','s','d','m','.','c','p','l',',',',','1',0}; -static const WCHAR szC_PRINTERS[] = {'m','a','i','n','.','c','p','l',' ','@','2',0}; - extern void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); @@ -63,22 +43,22 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR lpszCmdLine, INT nC } /* check for optional parameter */ - if (!lstrcmpiW(lpszCmdLine,szP_COLOR)) - launch(szC_COLOR); - if (!lstrcmpiW(lpszCmdLine,szP_DATETIME)) - launch(szC_DATETIME); - if (!lstrcmpiW(lpszCmdLine,szP_DESKTOP)) - launch(szC_DESKTOP); - if (!lstrcmpiW(lpszCmdLine,szP_INTERNATIONAL)) - launch(szC_INTERNATIONAL); - if (!lstrcmpiW(lpszCmdLine,szP_KEYBOARD)) - launch(szC_KEYBOARD); - if (!lstrcmpiW(lpszCmdLine,szP_MOUSE)) - launch(szC_MOUSE); - if (!lstrcmpiW(lpszCmdLine,szP_PORTS)) - launch(szC_PORTS); - if (!lstrcmpiW(lpszCmdLine,szP_PRINTERS)) - launch(szC_PRINTERS); + if (!lstrcmpiW(lpszCmdLine, L"COLOR")) + launch(L"desk.cpl,,2"); + if (!lstrcmpiW(lpszCmdLine, L"DATE/TIME")) + launch(L"timedate.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"DESKTOP")) + launch(L"desk.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"INTERNATIONAL")) + launch(L"intl.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"KEYBOARD")) + launch(L"main.cpl @1"); + if (!lstrcmpiW(lpszCmdLine, L"MOUSE")) + launch(L"main.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"PORTS")) + launch(L"sysdm.cpl,,1"); + if (!lstrcmpiW(lpszCmdLine, L"PRINTERS")) + launch(L"main.cpl @2"); /* try to launch if a .cpl file is given directly */ launch(lpszCmdLine); -- 2.26.2

1 0

[PATCH] clock: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/clock/main.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/programs/clock/main.c b/programs/clock/main.c index 3ad636be431..43364745ea5 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -104,10 +104,9 @@ static BOOL CLOCK_ResetTimer(void) period = 1000; if (!SetTimer (Globals.hMainWnd, TIMER_ID, period, NULL)) { - static const WCHAR notimersW[] = {'N','o',' ','a','v','a','i','l','a','b','l','e',' ','t','i','m','e','r','s',0}; WCHAR szApp[MAX_STRING_LEN]; LoadStringW(Globals.hInstance, IDS_CLOCK, szApp, MAX_STRING_LEN); - MessageBoxW(0, notimersW, szApp, MB_ICONEXCLAMATION | MB_OK); + MessageBoxW(0, L"No available timers", szApp, MB_ICONEXCLAMATION | MB_OK); return FALSE; } return TRUE; @@ -390,9 +389,6 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show MSG msg; WNDCLASSW class; - static const WCHAR szClassName[] = {'C','L','C','l','a','s','s',0}; - static const WCHAR szWinName[] = {'C','l','o','c','k',0}; - /* Setup Globals */ memset(&Globals.hFont, 0, sizeof (Globals.hFont)); Globals.bAnalog = TRUE; @@ -408,13 +404,13 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); class.hbrBackground = 0; class.lpszMenuName = 0; - class.lpszClassName = szClassName; + class.lpszClassName = L"CLClass"; } - + if (!RegisterClassW(&class)) return FALSE; - + Globals.MaxX = Globals.MaxY = INITIAL_WINDOW_SIZE; - Globals.hMainWnd = CreateWindowW(szClassName, szWinName, WS_OVERLAPPEDWINDOW, + Globals.hMainWnd = CreateWindowW(L"CLClass", L"Clock", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, Globals.MaxX, Globals.MaxY, 0, 0, hInstance, 0); -- 2.26.2

1 0

[PATCH] cabarc: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cabarc/cabarc.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index d244d6ce27e..3eb28fe9083 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -470,7 +470,6 @@ static BOOL add_file( HFCI fci, WCHAR *name ) static BOOL add_directory( HFCI fci, WCHAR *dir ) { - static const WCHAR wildcardW[] = {'*',0}; WCHAR *p, *buffer; HANDLE handle; WIN32_FIND_DATAW data; @@ -480,7 +479,7 @@ static BOOL add_directory( HFCI fci, WCHAR *dir ) lstrcpyW( buffer, dir ); p = buffer + lstrlenW( buffer ); if (p > buffer && p[-1] != '\\') *p++ = '\\'; - lstrcpyW( p, wildcardW ); + lstrcpyW( p, L"*" ); if ((handle = FindFirstFileW( buffer, &data )) != INVALID_HANDLE_VALUE) { @@ -524,7 +523,6 @@ static BOOL add_file_or_directory( HFCI fci, WCHAR *name ) static int new_cabinet( char *cab_dir ) { - static const WCHAR plusW[] = {'+',0}; WCHAR **file; ERF erf; BOOL ret = FALSE; @@ -550,7 +548,7 @@ static int new_cabinet( char *cab_dir ) for (file = opt_files; *file; file++) { - if (!lstrcmpW( *file, plusW )) + if (!lstrcmpW( *file, L"+" )) FCIFlushFolder( fci, fci_get_next_cab, fci_status ); else if (!(ret = add_file_or_directory( fci, *file ))) break; @@ -586,9 +584,6 @@ static void usage( void ) int __cdecl wmain( int argc, WCHAR *argv[] ) { - static const WCHAR noneW[] = {'n','o','n','e',0}; - static const WCHAR mszipW[] = {'m','s','z','i','p',0}; - WCHAR *p, *command; char buffer[MAX_PATH]; char filename[MAX_PATH]; @@ -617,8 +612,8 @@ int __cdecl wmain( int argc, WCHAR *argv[] ) break; case 'm': argv++; argc--; - if (!wcscmp( argv[1], noneW )) opt_compression = tcompTYPE_NONE; - else if (!wcscmp( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; + if (!wcscmp( argv[1], L"none" )) opt_compression = tcompTYPE_NONE; + else if (!wcscmp( argv[1], L"mszip" )) opt_compression = tcompTYPE_MSZIP; else { WINE_MESSAGE( "cabarc: Unknown compression type %s\n", debugstr_w(argv[1])); -- 2.26.2

1 0

[PATCH] attrib: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/attrib/attrib.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 558a393253c..53f63020973 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -24,8 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(attrib); -static const WCHAR starW[] = {'*','\0'}; - /* ========================================================================= * Load a string from the resource file, handling any error * Returns string retrieved from resource file @@ -33,11 +31,10 @@ static const WCHAR starW[] = {'*','\0'}; static WCHAR *ATTRIB_LoadMessage(UINT id) { static WCHAR msg[MAXSTRING]; - const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); - lstrcpyW(msg, failedMsg); + lstrcpyW(msg, L"Failed!"); } return msg; } @@ -144,8 +141,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, WCHAR buffer[MAX_PATH]; HANDLE hff; WIN32_FIND_DATAW fd; - WCHAR flags[] = {' ',' ',' ',' ',' ',' ',' ',' ','\0'}; - static const WCHAR slashW[] = {'\\','\0'}; + WCHAR flags[] = L" "; WINE_TRACE("Processing dir '%s', spec '%s', %d,%x,%x\n", wine_dbgstr_w(rootdir), wine_dbgstr_w(filespec), @@ -155,25 +151,22 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, /* Build spec to search for */ lstrcpyW(buffer, rootdir); - lstrcatW(buffer, starW); + lstrcatW(buffer, L"*"); /* Search for directories in the location and recurse if necessary */ WINE_TRACE("Searching for directories with '%s'\n", wine_dbgstr_w(buffer)); hff = FindFirstFileW(buffer, &fd); if (hff != INVALID_HANDLE_VALUE) { do { - const WCHAR dot[] = {'.', 0}; - const WCHAR dotdot[] = {'.', '.', 0}; - /* Only interested in directories, and not . nor .. */ if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - !lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) + !lstrcmpW(fd.cFileName, L".") || !lstrcmpW(fd.cFileName, L"..")) continue; /* Build new root dir to go searching in */ lstrcpyW(buffer, rootdir); lstrcatW(buffer, fd.cFileName); - lstrcatW(buffer, slashW); + lstrcatW(buffer, L"\\"); ATTRIB_processdirectory(buffer, filespec, recurse, includedirs, attrib_set, attrib_clear); @@ -191,12 +184,10 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, hff = FindFirstFileW(buffer, &fd); if (hff != INVALID_HANDLE_VALUE) { do { - const WCHAR dot[] = {'.', 0}; - const WCHAR dotdot[] = {'.', '.', 0}; DWORD count; WINE_TRACE("Found '%s'\n", wine_dbgstr_w(fd.cFileName)); - if (!lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) + if (!lstrcmpW(fd.cFileName, L".") || !lstrcmpW(fd.cFileName, L"..")) continue; if (!includedirs && (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) @@ -212,7 +203,6 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, SetFileAttributesW(buffer, fd.dwFileAttributes); found = TRUE; } else { - static const WCHAR fmt[] = {'%','1',' ',' ',' ',' ',' ','%','2','\n','\0'}; if (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) { flags[4] = 'H'; } @@ -233,7 +223,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, } lstrcpyW(buffer, rootdir); lstrcatW(buffer, fd.cFileName); - ATTRIB_wprintf(fmt, flags, buffer); + ATTRIB_wprintf(L"%1 %2\n", flags, buffer); for (count = 0; count < (ARRAY_SIZE(flags) - 1); count++) flags[count] = ' '; found = TRUE; } @@ -253,18 +243,16 @@ int __cdecl wmain(int argc, WCHAR *argv[]) DWORD attrib_clear = 0; BOOL attrib_recurse = FALSE; BOOL attrib_includedirs = FALSE; - static const WCHAR help_option[] = {'/','?','\0'}; - static const WCHAR wildcardsW[] = {'*','?','\0'}; int i = 1; BOOL found = FALSE; - if ((argc >= 2) && !lstrcmpW(argv[1], help_option)) { + if ((argc >= 2) && !lstrcmpW(argv[1], L"/?")) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_HELP)); return 0; } /* By default all files from current directory are taken into account */ - lstrcpyW(name, starW); + lstrcpyW(name, L"*"); while (i < argc) { WCHAR *param = argv[i++]; @@ -311,7 +299,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) /* If a directory is explicitly supplied on the command line, and no wildcards are in the name, then allow it to be changed/displayed */ - if (wcspbrk(originalname, wildcardsW) == NULL) attrib_includedirs = TRUE; + if (wcspbrk(originalname, L"*?") == NULL) attrib_includedirs = TRUE; /* Do all the processing based on the filename arg */ found = ATTRIB_processdirectory(curdir, name, attrib_recurse, -- 2.26.2

1 0

[PATCH] packager: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/packager/packager_main.c | 11 +++-------- dlls/packager/tests/oleobj.c | 8 ++------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 0a0790e9030..de07e5ca265 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -181,8 +181,7 @@ static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwRese static HRESULT do_activate_object(struct Package *This, HWND parent) { - static const WCHAR openW[] = {'o','p','e','n',0}; - ShellExecuteW(parent, openW, This->filename, NULL, NULL, SW_SHOW); + ShellExecuteW(parent, L"open", This->filename, NULL, NULL, SW_SHOW); return S_OK; } @@ -396,11 +395,9 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, WCHAR *stream_filename; WCHAR *base_end, extension[MAX_PATH]; - static const WCHAR ole10nativeW[] = {0x0001,'O','l','e','1','0','N','a','t','i','v','e',0}; - TRACE("(%p)->(%p)\n", This, pStg); - hr = IStorage_OpenStream(pStg, ole10nativeW, NULL, + hr = IStorage_OpenStream(pStg, L"\1Ole10Native", NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); if(FAILED(hr)){ TRACE("OpenStream gave: %08x\n", hr); @@ -489,8 +486,6 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, file = CreateFileW(This->filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); while(file == INVALID_HANDLE_VALUE){ - static const WCHAR fmtW[] = {' ','(','%','u',')',0}; - if(GetLastError() != ERROR_FILE_EXISTS){ WARN("CreateFile failed: %u\n", GetLastError()); hr = E_FAIL; @@ -499,7 +494,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, /* file exists, so increment file name and try again */ ++i; - wsprintfW(base_end, fmtW, i); + wsprintfW(base_end, L" (%u)", i); lstrcatW(base_end, extension); file = CreateFileW(This->filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 1ce54eda7e7..62875584931 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -210,9 +210,7 @@ static HRESULT WINAPI stg_CreateStream(IStorage* This, LPCOLESTR pwcsName, static HRESULT WINAPI stg_OpenStream(IStorage* This, LPCOLESTR pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream **ppstm) { - static const WCHAR ole10NativeW[] = {1,'O','l','e','1','0','N','a','t','i','v','e',0}; - - if(lstrcmpW(pwcsName, ole10NativeW)) + if(lstrcmpW(pwcsName, L"\1Ole10Native")) return STG_E_FILENOTFOUND; *ppstm = &ole10native_stream; @@ -417,8 +415,6 @@ static void test_packager(void) char contents[11]; BOOL br, extended = FALSE; - static const WCHAR filename3W[] = {'f','i','l','e','n','a','m','e','3','.','t','x','t',0}; - hr = CoCreateInstance(&CLSID_Package, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IOleObject, (void**)&oleobj); ok(hr == S_OK || @@ -458,7 +454,7 @@ static void test_packager(void) if(extended){ len = GetTempPathW(ARRAY_SIZE(filename), filename); - lstrcpyW(filename + len, filename3W); + lstrcpyW(filename + len, L"filename3.txt"); file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); -- 2.26.2

1 0

[PATCH] conhost: Correct whitespace placement in a TRACE()
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index ac0e22b4c42..a54238c80f6 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2477,7 +2477,7 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_PEEK: { void *result; - TRACE( "peek\n "); + TRACE( "peek\n" ); if (in_size) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console ); *out_size = min( *out_size, console->record_count * sizeof(INPUT_RECORD) ); -- 2.26.2

1 0

[PATCH 1/2] ntdll: Unwind to the LR register if no unwind info is available
by Martin Storsjo 05 Oct '20

05 Oct '20

Try to keep the behaviour from ea9f47a767c2 of erroring out if unwinding ends up out of bounds (with pc==lr, where setting pc to lr doesn't progress the unwind), but support unwinding from functions without unwind info. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/ntdll/signal_arm64.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index eb451603fe4..c9f44e92d30 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -197,8 +197,16 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX } else { - WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); - return STATUS_INVALID_DISPOSITION; + status = context->Pc != context->u.s.Lr ? + STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; + WARN( "exception data not found in %s for %p, LR %p, status %x\n", + debugstr_w(module->BaseDllName.Buffer), (void*) context->Pc, + (void*) context->u.s.Lr, status ); + dispatch->EstablisherFrame = context->Sp; + dispatch->LanguageHandler = NULL; + context->Pc = context->u.s.Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + return status; } dispatch->EstablisherFrame = context->u.s.Fp; -- 2.17.1

2 3

[PATCH v2 1/5] ntdll: Introduce RtlProcessFlsData() and use it for FLS data destruction.
by Paul Gofman 05 Oct '20

05 Oct '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernelbase/thread.c | 2 +- dlls/ntdll/loader.c | 3 ++- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 10 ++++++++++ include/winternl.h | 1 + 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 0bfef62a7da..f2b746856e1 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1022,7 +1022,7 @@ void WINAPI DECLSPEC_HOTPATCH DeleteFiber( LPVOID fiber_ptr ) RtlExitUserThread( 1 ); } RtlFreeUserStack( fiber->stack_allocation ); - HeapFree( GetProcessHeap(), 0, fiber->fls_slots ); + RtlProcessFlsData( fiber->fls_slots, 3 ); HeapFree( GetProcessHeap(), 0, fiber ); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 20bc3f977d1..cd27ce5658b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3255,7 +3255,8 @@ void WINAPI LdrShutdownThread(void) for (i = 0; i < tls_module_count; i++) RtlFreeHeap( GetProcessHeap(), 0, pointers[i] ); RtlFreeHeap( GetProcessHeap(), 0, pointers ); } - RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->FlsSlots ); + RtlProcessFlsData( NtCurrentTeb()->FlsSlots, 3 ); + NtCurrentTeb()->FlsSlots = NULL; RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->TlsExpansionSlots ); NtCurrentTeb()->TlsExpansionSlots = NULL; RtlReleasePebLock(); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ce9f6281d5d..6f44f499825 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -874,6 +874,7 @@ @ stdcall RtlPopFrame(ptr) @ stdcall RtlPrefixString(ptr ptr long) @ stdcall RtlPrefixUnicodeString(ptr ptr long) +@ stdcall RtlProcessFlsData(ptr long) @ stub RtlPropertySetNameToGuid @ stub RtlProtectHeap @ stdcall RtlPushFrame(ptr) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 716ef3b61d0..57292043582 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -343,3 +343,13 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsGetValue( ULONG index, void **data ) return STATUS_SUCCESS; } + + +/*********************************************************************** + * RtlProcessFlsData (NTDLL.@) + */ +void WINAPI DECLSPEC_HOTPATCH RtlProcessFlsData( void *teb_fls_data, ULONG flags ) +{ + if (flags & 2) + RtlFreeHeap( GetProcessHeap(), 0, teb_fls_data ); +} diff --git a/include/winternl.h b/include/winternl.h index 82328167c9e..75324635ed7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3480,6 +3480,7 @@ NTSYSAPI NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM); NTSYSAPI void WINAPI RtlPopFrame(TEB_ACTIVE_FRAME*); NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); +NTSYSAPI void WINAPI RtlProcessFlsData(void*,ULONG); NTSYSAPI void WINAPI RtlPushFrame(TEB_ACTIVE_FRAME*); NTSYSAPI NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings(DWORD,HANDLE,const WCHAR*,const WCHAR*,WCHAR*,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*); -- 2.26.2

2 9

[PATCH] ucrtbase: Add [_]strtold[_l].
by Gijs Vermeulen 05 Oct '20

05 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49873 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- .../api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- .../api-ms-win-crt-private-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index a67828e6d22..d662921d028 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -35,7 +35,7 @@ @ cdecl -ret64 _strtoi64_l(str ptr long ptr) ucrtbase._strtoi64_l @ cdecl -ret64 _strtoimax_l(str ptr long ptr) ucrtbase._strtoimax_l @ cdecl _strtol_l(str ptr long ptr) ucrtbase._strtol_l -@ stub _strtold_l +@ cdecl _strtold_l(str ptr ptr) ucrtbase._strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) ucrtbase._strtoll_l @ cdecl -ret64 _strtoui64(str ptr long) ucrtbase._strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) ucrtbase._strtoui64_l @@ -96,7 +96,7 @@ @ cdecl strtof(str ptr) ucrtbase.strtof @ cdecl -ret64 strtoimax(str ptr long) ucrtbase.strtoimax @ cdecl strtol(str ptr long) ucrtbase.strtol -@ stub strtold +@ cdecl strtold(str ptr) ucrtbase.strtold @ cdecl -ret64 strtoll(str ptr long) ucrtbase.strtoll @ cdecl strtoul(str ptr long) ucrtbase.strtoul @ cdecl -ret64 strtoull(str ptr long) ucrtbase.strtoull diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 87dc6585f3c..4dd07406db3 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -719,7 +719,7 @@ @ cdecl -ret64 _o__strtoi64(str ptr long) ucrtbase._o__strtoi64 @ cdecl -ret64 _o__strtoi64_l(str ptr long ptr) ucrtbase._o__strtoi64_l @ cdecl _o__strtol_l(str ptr long ptr) ucrtbase._o__strtol_l -@ stub _o__strtold_l +@ cdecl _o__strtold_l(str ptr ptr) ucrtbase._o__strtold_l @ cdecl -ret64 _o__strtoll_l(str ptr long ptr) ucrtbase._o__strtoll_l @ cdecl -ret64 _o__strtoui64(str ptr long) ucrtbase._o__strtoui64 @ cdecl -ret64 _o__strtoui64_l(str ptr long ptr) ucrtbase._o__strtoui64_l @@ -1126,7 +1126,7 @@ @ cdecl _o_strtok(str str) ucrtbase._o_strtok @ cdecl _o_strtok_s(ptr str ptr) ucrtbase._o_strtok_s @ cdecl _o_strtol(str ptr long) ucrtbase._o_strtol -@ stub _o_strtold +@ cdecl _o_strtold(str ptr) ucrtbase._o_strtold @ cdecl -ret64 _o_strtoll(str ptr long) ucrtbase._o_strtoll @ cdecl _o_strtoul(str ptr long) ucrtbase._o_strtoul @ cdecl -ret64 _o_strtoull(str ptr long) ucrtbase._o_strtoull diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0d38f97fffe..4c944a9d213 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1736,7 +1736,7 @@ @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoimax_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ stub _strtold_l +@ cdecl _strtold_l(str ptr ptr) MSVCRT_strtod_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @@ -2391,7 +2391,7 @@ @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol -@ stub strtold +@ cdecl strtold(str ptr) MSVCRT_strtod @ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2013b06cc7c..9d292ccef5a 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1447,7 +1447,7 @@ @ cdecl -ret64 _strtoi64_l(str ptr long ptr) msvcr120._strtoi64_l @ cdecl -ret64 _strtoimax_l(str ptr long ptr) msvcr120._strtoimax_l @ cdecl _strtol_l(str ptr long ptr) msvcr120._strtol_l -@ stub _strtold_l +@ cdecl _strtold_l(str ptr ptr) msvcr120._strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) msvcr120._strtoll_l @ cdecl -ret64 _strtoui64(str ptr long) msvcr120._strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) msvcr120._strtoui64_l @@ -2054,7 +2054,7 @@ @ cdecl strtok(str str) msvcr120.strtok @ cdecl strtok_s(ptr str ptr) msvcr120.strtok_s @ cdecl strtol(str ptr long) msvcr120.strtol -@ stub strtold +@ cdecl strtold(str ptr) msvcr120.strtold @ cdecl -ret64 strtoll(str ptr long) msvcr120.strtoll @ cdecl strtoul(str ptr long) msvcr120.strtoul @ cdecl -ret64 strtoull(str ptr long) msvcr120.strtoull diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index f556b9e1c3d..468d8dbb5ab 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1383,7 +1383,7 @@ @ cdecl -ret64 _o__strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _o__strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl _o__strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ stub _o__strtold_l +@ cdecl _o__strtold_l(str ptr ptr) MSVCRT_strtod_l @ cdecl -ret64 _o__strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _o__strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _o__strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @@ -1791,7 +1791,7 @@ @ cdecl _o_strtok(str str) MSVCRT_strtok @ cdecl _o_strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl _o_strtol(str ptr long) MSVCRT_strtol -@ stub _o_strtold +@ cdecl _o_strtold(str ptr) MSVCRT_strtod @ cdecl -ret64 _o_strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl _o_strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 _o_strtoull(str ptr long) MSVCRT_strtoui64 @@ -1954,7 +1954,7 @@ @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoimax_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ stub _strtold_l +@ cdecl _strtold_l(str ptr ptr) MSVCRT_strtod_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @@ -2522,7 +2522,7 @@ @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol -@ stub strtold +@ cdecl strtold(str ptr) MSVCRT_strtod @ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 -- 2.28.0

2 1

[PATCH 5/5] dxgi: Retrieve d3d12 swapchain fullscreen state from wined3d.
by Zhiyi Zhang 05 Oct '20

05 Oct '20

Once Alt+Enter handling is implemented, the fullscreen state may change without dxgi necessarily being aware of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 19 +++++++++++++++++-- dlls/wined3d/swapchain.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index d778ab9e03d..f3b74389d29 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2276,7 +2276,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapCha TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); if (fullscreen) - *fullscreen = !swapchain->fullscreen_desc.Windowed; + { + wined3d_mutex_lock(); + *fullscreen = !wined3d_swapchain_state_is_windowed(swapchain->state); + wined3d_mutex_unlock(); + } if (target && (*target = swapchain->target)) IDXGIOutput_AddRef(*target); @@ -2289,6 +2293,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain4 *iface, struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc = &swapchain->fullscreen_desc; const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc = &swapchain->desc; + BOOL windowed; TRACE("iface %p, desc %p.\n", iface, desc); @@ -2298,6 +2303,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain4 *iface, return E_INVALIDARG; } + wined3d_mutex_lock(); + windowed = wined3d_swapchain_state_is_windowed(swapchain->state); + wined3d_mutex_unlock(); + desc->BufferDesc.Width = swapchain_desc->Width; desc->BufferDesc.Height = swapchain_desc->Height; desc->BufferDesc.RefreshRate = fullscreen_desc->RefreshRate; @@ -2308,7 +2317,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain4 *iface, desc->BufferUsage = swapchain_desc->BufferUsage; desc->BufferCount = swapchain_desc->BufferCount; desc->OutputWindow = swapchain->window; - desc->Windowed = fullscreen_desc->Windowed; + desc->Windowed = windowed; desc->SwapEffect = swapchain_desc->SwapEffect; desc->Flags = swapchain_desc->Flags; @@ -2470,6 +2479,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenDesc(IDXGISwapChai DXGI_SWAP_CHAIN_FULLSCREEN_DESC *desc) { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); + BOOL windowed; TRACE("iface %p, desc %p.\n", iface, desc); @@ -2479,7 +2489,12 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenDesc(IDXGISwapChai return E_INVALIDARG; } + wined3d_mutex_lock(); + windowed = wined3d_swapchain_state_is_windowed(swapchain->state); + wined3d_mutex_unlock(); + *desc = swapchain->fullscreen_desc; + desc->Windowed = windowed; return S_OK; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6270c363bb9..d0d93417a18 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2266,6 +2266,13 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st return WINED3D_OK; } +BOOL CDECL wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state) +{ + TRACE("state %p.\n", state); + + return state->desc.windowed; +} + void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state) { heap_free(state); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index cf792746cc7..d11e06d0c34 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -291,6 +291,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) +@ cdecl wined3d_swapchain_state_is_windowed(ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3535a69bacb..238961006a0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2806,6 +2806,7 @@ void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, H HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); +BOOL __cdecl wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, -- 2.25.1

2 1

[PATCH 4/5] dxgi: Support creating a fullscreen swapchain on d3d12.
by Zhiyi Zhang 05 Oct '20

05 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 27 ++++++++++++++++++++++++--- dlls/dxgi/tests/dxgi.c | 3 +-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index c8f1502a13a..d778ab9e03d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2981,11 +2981,34 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, output, window, swapchain_desc, fullscreen_desc); - IDXGIOutput_Release(output); if (FAILED(hr)) + { + IDXGIOutput_Release(output); return hr; + } + if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, &swapchain->state))) + { + IDXGIOutput_Release(output); return hr; + } + + if (!fullscreen_desc->Windowed) + { + hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL); + if (FAILED(hr)) + { + wined3d_swapchain_state_destroy(swapchain->state); + IDXGIOutput_Release(output); + return hr; + } + + swapchain->target = output; + } + else + { + IDXGIOutput_Release(output); + } if (swapchain_desc->BufferUsage && swapchain_desc->BufferUsage != DXGI_USAGE_RENDER_TARGET_OUTPUT) FIXME("Ignoring buffer usage %#x.\n", swapchain_desc->BufferUsage); @@ -3002,8 +3025,6 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); if (fullscreen_desc->Scaling) FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); - if (!fullscreen_desc->Windowed) - FIXME("Fullscreen not supported yet.\n"); vk_instance = vkd3d_instance_get_vk_instance(vkd3d_instance_from_device(device)); vk_physical_device = vkd3d_get_vk_physical_device(device); diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e6b5a4e66b3..f747e236f31 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2953,7 +2953,6 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n", adapter_idx, output_idx, hr); ok(fullscreen, "Adapter %u output %u: Expected fullscreen.\n", adapter_idx, output_idx); - todo_wine_if(is_d3d12) ok(!!containing_output, "Adapter %u output %u: Expected a valid output.\n", adapter_idx, output_idx); if (containing_output) @@ -2962,7 +2961,7 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 ret = GetWindowRect(swapchain_desc.OutputWindow, &window_rect); ok(ret, "Adapter %u output %u: GetWindowRect failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); - todo_wine_if(is_d3d12) ok(EqualRect(&window_rect, &output_desc.DesktopCoordinates), + ok(EqualRect(&window_rect, &output_desc.DesktopCoordinates), "Adapter %u output %u: Expect window rect %s, got %s.\n", adapter_idx, output_idx, wine_dbgstr_rect(&output_desc.DesktopCoordinates), wine_dbgstr_rect(&window_rect)); -- 2.25.1

3 2

[PATCH 3/5] dxgi/tests: Run test_default_fullscreen_target_output() on d3d12 as well.
by Zhiyi Zhang 05 Oct '20

05 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 44 ++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index dac224f654d..e6b5a4e66b3 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2796,7 +2796,7 @@ done: ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } -static void test_default_fullscreen_target_output(void) +static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d12) { IDXGIOutput *output, *containing_output, *target; unsigned int adapter_idx, output_idx; @@ -2806,19 +2806,12 @@ static void test_default_fullscreen_target_output(void) IDXGISwapChain *swapchain; IDXGIFactory *factory; IDXGIAdapter *adapter; - IDXGIDevice *device; + BOOL fullscreen, ret; RECT window_rect; ULONG refcount; HRESULT hr; - BOOL ret; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - - get_factory((IUnknown *)device, FALSE, &factory); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; @@ -2828,8 +2821,8 @@ static void test_default_fullscreen_target_output(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); @@ -2848,6 +2841,14 @@ static void test_default_fullscreen_target_output(void) ok(SUCCEEDED(hr), "Adapter %u output %u: CreateSwapChain failed, hr %#x.\n", adapter_idx, output_idx, hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &containing_output); + ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, hr); + ok(!fullscreen, "Adapter %u output %u: Expected not fullscreen.\n", adapter_idx, + output_idx); + ok(!containing_output, "Adapter %u output %u: Expected a null output.\n", adapter_idx, + output_idx); + /* Move the OutputWindow to the current output. */ hr = IDXGIOutput_GetDesc(output, &output_desc); ok(SUCCEEDED(hr), "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, @@ -2948,10 +2949,20 @@ static void test_default_fullscreen_target_output(void) continue; } + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &containing_output); + ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, hr); + ok(fullscreen, "Adapter %u output %u: Expected fullscreen.\n", adapter_idx, output_idx); + todo_wine_if(is_d3d12) + ok(!!containing_output, "Adapter %u output %u: Expected a valid output.\n", adapter_idx, + output_idx); + if (containing_output) + IDXGIOutput_Release(containing_output); + ret = GetWindowRect(swapchain_desc.OutputWindow, &window_rect); ok(ret, "Adapter %u output %u: GetWindowRect failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); - ok(EqualRect(&window_rect, &output_desc.DesktopCoordinates), + todo_wine_if(is_d3d12) ok(EqualRect(&window_rect, &output_desc.DesktopCoordinates), "Adapter %u output %u: Expect window rect %s, got %s.\n", adapter_idx, output_idx, wine_dbgstr_rect(&output_desc.DesktopCoordinates), wine_dbgstr_rect(&window_rect)); @@ -2979,10 +2990,8 @@ static void test_default_fullscreen_target_output(void) IDXGIAdapter_Release(adapter); } - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "IDXGIFactory has %u references left.\n", refcount); } static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window, @@ -6989,7 +6998,6 @@ START_TEST(dxgi) /* These tests use full-screen swapchains, so shouldn't run in parallel. */ test_create_swapchain(); - test_default_fullscreen_target_output(); test_inexact_modes(); test_gamma_control(); test_multi_adapter(); @@ -7006,6 +7014,7 @@ START_TEST(dxgi) run_on_d3d10(test_cursor_clipping); run_on_d3d10(test_get_containing_output); run_on_d3d10(test_window_association); + run_on_d3d10(test_default_fullscreen_target_output); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -7034,6 +7043,7 @@ START_TEST(dxgi) run_on_d3d12(test_colour_space_support); run_on_d3d12(test_get_containing_output); run_on_d3d12(test_window_association); + run_on_d3d12(test_default_fullscreen_target_output); FreeLibrary(d3d12_module); } -- 2.25.1

2 1

[PATCH 2/5] dxgi/tests: Run test_window_association() on d3d12 as well.
by Zhiyi Zhang 05 Oct '20

05 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 2a68947c68e..dac224f654d 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6122,15 +6122,13 @@ done: ok(!refcount, "Factory has %u references left.\n", refcount); } -static void test_window_association(void) +static void test_window_association(IUnknown *device, BOOL is_d3d12) { DXGI_SWAP_CHAIN_DESC swapchain_desc; LONG_PTR original_wndproc, wndproc; IDXGIFactory *factory, *factory2; IDXGISwapChain *swapchain; IDXGIOutput *output; - IDXGIAdapter *adapter; - IDXGIDevice *device; HWND hwnd, hwnd2; BOOL fullscreen; unsigned int i; @@ -6142,6 +6140,7 @@ static void test_window_association(void) UINT flag; BOOL expect_fullscreen; BOOL broken_d3d10; + BOOL todo_on_d3d12; } tests[] = { @@ -6155,24 +6154,18 @@ static void test_window_association(void) * - Posting them hangs the posting thread. Another thread that keeps * sending input is needed to avoid the hang. The hang is not * because of flush_events(). */ - {0, TRUE}, + {0, TRUE, FALSE, TRUE}, {0, FALSE}, {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, {DXGI_MWA_NO_ALT_ENTER, FALSE, TRUE}, {DXGI_MWA_NO_ALT_ENTER, FALSE}, - {DXGI_MWA_NO_PRINT_SCREEN, TRUE}, + {DXGI_MWA_NO_PRINT_SCREEN, TRUE, FALSE, TRUE}, {DXGI_MWA_NO_PRINT_SCREEN, FALSE}, - {0, TRUE}, + {0, TRUE, FALSE, TRUE}, {0, FALSE} }; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - swapchain_desc.BufferDesc.Width = 640; swapchain_desc.BufferDesc.Height = 480; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; @@ -6183,10 +6176,10 @@ static void test_window_association(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; original_wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); @@ -6195,11 +6188,7 @@ static void test_window_association(void) hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory2); ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - refcount = IDXGIAdapter_Release(adapter); + get_factory(device, is_d3d12, &factory); hr = IDXGIFactory_GetWindowAssociation(factory, NULL); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); @@ -6229,7 +6218,7 @@ static void test_window_association(void) ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); /* Alt+Enter tests. */ - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); @@ -6275,6 +6264,7 @@ static void test_window_association(void) output = NULL; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(is_d3d12 && tests[i].todo_on_d3d12) ok(fullscreen == tests[i].expect_fullscreen || broken(tests[i].broken_d3d10 && fullscreen), "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); @@ -6299,10 +6289,8 @@ static void test_window_association(void) ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "IDXGIFactory has %u references left.\n", refcount); } static void test_output_ownership(IUnknown *device, BOOL is_d3d12) @@ -7008,7 +6996,6 @@ START_TEST(dxgi) test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); - test_window_association(); run_on_d3d10(test_set_fullscreen); run_on_d3d10(test_resize_target); run_on_d3d10(test_swapchain_resize); @@ -7018,6 +7005,7 @@ START_TEST(dxgi) run_on_d3d10(test_output_ownership); run_on_d3d10(test_cursor_clipping); run_on_d3d10(test_get_containing_output); + run_on_d3d10(test_window_association); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -7045,6 +7033,7 @@ START_TEST(dxgi) run_on_d3d12(test_frame_latency_event); run_on_d3d12(test_colour_space_support); run_on_d3d12(test_get_containing_output); + run_on_d3d12(test_window_association); FreeLibrary(d3d12_module); } -- 2.25.1

3 2

[PATCH 1/5] dxgi/tests: Run test_get_containing_output() on d3d12 as well.
by Zhiyi Zhang 05 Oct '20

05 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 46 ++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a34f574236e..2a68947c68e 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2123,7 +2123,7 @@ static HMONITOR get_primary_if_right_side_secondary(const DXGI_OUTPUT_DESC *outp return NULL; } -static void test_get_containing_output(void) +static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) { unsigned int adapter_idx, output_idx, output_count; DXGI_OUTPUT_DESC output_desc, output_desc2; @@ -2134,7 +2134,6 @@ static void test_get_containing_output(void) IDXGIFactory *factory; IDXGIAdapter *adapter; POINT points[4 * 16]; - IDXGIDevice *device; unsigned int i, j; HMONITOR monitor; HMONITOR primary; @@ -2143,17 +2142,21 @@ static void test_get_containing_output(void) HRESULT hr; BOOL ret; - if (!(device = create_device(0))) + adapter = get_adapter(device, is_d3d12); + if (!adapter) { - skip("Failed to create device.\n"); + skip("Failed to get adapter on Direct3D %d.\n", is_d3d12 ? 12 : 10); return; } - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); - - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + output_count = 0; + while ((hr = IDXGIAdapter_EnumOutputs(adapter, output_count, &output)) != DXGI_ERROR_NOT_FOUND) + { + ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_count, hr); + IDXGIOutput_Release(output); + ++output_count; + } + IDXGIAdapter_Release(adapter); swapchain_desc.BufferDesc.Width = 100; swapchain_desc.BufferDesc.Height = 100; @@ -2165,23 +2168,15 @@ static void test_get_containing_output(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 100, 100, 0, 0, 0, 0); swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - output_count = 0; - while (IDXGIAdapter_EnumOutputs(adapter, output_count, &output) != DXGI_ERROR_NOT_FOUND) - { - ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_count, hr); - IDXGIOutput_Release(output); - ++output_count; - } - IDXGIAdapter_Release(adapter); - - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + get_factory(device, is_d3d12, &factory); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); monitor = MonitorFromWindow(swapchain_desc.OutputWindow, 0); @@ -2436,7 +2431,7 @@ static void test_get_containing_output(void) flush_events(); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); - ok(!fullscreen, "Expect swapchain not full screen.\n"); + todo_wine_if(is_d3d12) ok(!fullscreen, "Expect swapchain not full screen.\n"); /* Move the swapchain output window to the second output */ hr = IDXGIOutput_GetDesc(output2, &output_desc2); @@ -2490,10 +2485,8 @@ static void test_get_containing_output(void) done: refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "IDXGIFactory has %u references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); } @@ -7011,7 +7004,6 @@ START_TEST(dxgi) test_default_fullscreen_target_output(); test_inexact_modes(); test_gamma_control(); - test_get_containing_output(); test_multi_adapter(); test_swapchain_parameters(); test_swapchain_window_messages(); @@ -7025,6 +7017,7 @@ START_TEST(dxgi) run_on_d3d10(test_swapchain_formats); run_on_d3d10(test_output_ownership); run_on_d3d10(test_cursor_clipping); + run_on_d3d10(test_get_containing_output); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -7051,6 +7044,7 @@ START_TEST(dxgi) run_on_d3d12(test_cursor_clipping); run_on_d3d12(test_frame_latency_event); run_on_d3d12(test_colour_space_support); + run_on_d3d12(test_get_containing_output); FreeLibrary(d3d12_module); } -- 2.25.1

2 1

[PATCH] ucrtbase: Add partial strtold implementation.
by Gijs Vermeulen 05 Oct '20

05 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49873 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/string.c | 13 +++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index a67828e6d22..f3585ccf3b0 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -96,7 +96,7 @@ @ cdecl strtof(str ptr) ucrtbase.strtof @ cdecl -ret64 strtoimax(str ptr long) ucrtbase.strtoimax @ cdecl strtol(str ptr long) ucrtbase.strtol -@ stub strtold +@ cdecl strtold(str ptr) ucrtbase.strtold @ cdecl -ret64 strtoll(str ptr long) ucrtbase.strtoll @ cdecl strtoul(str ptr long) ucrtbase.strtoul @ cdecl -ret64 strtoull(str ptr long) ucrtbase.strtoull diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 87dc6585f3c..fe5d0c4b11d 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -1126,7 +1126,7 @@ @ cdecl _o_strtok(str str) ucrtbase._o_strtok @ cdecl _o_strtok_s(ptr str ptr) ucrtbase._o_strtok_s @ cdecl _o_strtol(str ptr long) ucrtbase._o_strtol -@ stub _o_strtold +@ cdecl _o_strtold(str ptr) ucrtbase._o_strtold @ cdecl -ret64 _o_strtoll(str ptr long) ucrtbase._o_strtoll @ cdecl _o_strtoul(str ptr long) ucrtbase._o_strtoul @ cdecl -ret64 _o_strtoull(str ptr long) ucrtbase._o_strtoull diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0d38f97fffe..3a45084d8b0 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2391,7 +2391,7 @@ @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol -@ stub strtold +@ cdecl strtold(str ptr) MSVCRT_strtold @ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2013b06cc7c..a50697c5e41 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -2054,7 +2054,7 @@ @ cdecl strtok(str str) msvcr120.strtok @ cdecl strtok_s(ptr str ptr) msvcr120.strtok_s @ cdecl strtol(str ptr long) msvcr120.strtol -@ stub strtold +@ cdecl strtold(str ptr) msvcr120.strtold @ cdecl -ret64 strtoll(str ptr long) msvcr120.strtoll @ cdecl strtoul(str ptr long) msvcr120.strtoul @ cdecl -ret64 strtoull(str ptr long) msvcr120.strtoull diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3343f1e3ccf..abf1c867a16 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1058,6 +1058,19 @@ double CDECL MSVCRT_strtod( const char *str, char **end ) #if _MSVCR_VER>=120 +/********************************************************************* + * strtold (MSVCR120.@) + */ +long double CDECL MSVCRT_strtold( const char *str, char **end ) +{ +#ifdef HAVE_STRTOLD + return strtold( str, end ); +#else + FIXME( "strtold not available!\n" ); + return 0; +#endif +} + /********************************************************************* * strtof_l (MSVCR120.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index f556b9e1c3d..18afedfdf5b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1791,7 +1791,7 @@ @ cdecl _o_strtok(str str) MSVCRT_strtok @ cdecl _o_strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl _o_strtol(str ptr long) MSVCRT_strtol -@ stub _o_strtold +@ cdecl _o_strtold(str ptr) MSVCRT_strtold @ cdecl -ret64 _o_strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl _o_strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 _o_strtoull(str ptr long) MSVCRT_strtoui64 @@ -2522,7 +2522,7 @@ @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol -@ stub strtold +@ cdecl strtold(str ptr) MSVCRT_strtold @ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 -- 2.28.0

2 1

[PATCH 1/2] msxml3/tests: Use wide string literals in more tests.
by Nikolay Sivov 05 Oct '20

05 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/httpreq.c | 7 +- dlls/msxml3/tests/saxreader.c | 158 ++++++++++++++-------------------- dlls/msxml3/tests/schema.c | 21 ++--- dlls/msxml3/tests/xmldoc.c | 79 +++++++---------- dlls/msxml3/tests/xmlview.c | 16 ++-- 5 files changed, 110 insertions(+), 171 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 74c302d5ebe..5f5137dd166 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1444,8 +1444,6 @@ static void test_XMLHTTP(void) static const char bodyA[] = "mode=Test"; static const char urlA[] = "http://test.winehq.org/tests/post.php"; static const char referertesturl[] = "http://test.winehq.org/tests/referer.php"; - static const WCHAR wszExpectedResponse[] = {'F','A','I','L','E','D',0}; - static const WCHAR norefererW[] = {'n','o',' ','r','e','f','e','r','e','r',' ','s','e','t',0}; IXMLHttpRequest *xhr; IObjectWithSite *obj_site, *obj_site2; @@ -1631,8 +1629,7 @@ static void test_XMLHTTP(void) * not what the server expects */ if(hr == S_OK) { - ok(!memcmp(bstrResponse, wszExpectedResponse, sizeof(wszExpectedResponse)), - "expected %s, got %s\n", wine_dbgstr_w(wszExpectedResponse), wine_dbgstr_w(bstrResponse)); + ok(!memcmp(bstrResponse, L"FAILED", 7 * sizeof(WCHAR)), "Unexpected response %s.\n", wine_dbgstr_w(bstrResponse)); SysFreeString(bstrResponse); } @@ -1713,7 +1710,7 @@ static void test_XMLHTTP(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXMLHttpRequest_get_responseText(xhr, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, norefererW), "got response text %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"no referer set"), "got response text %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* interaction with object site */ diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 986f429cc1b..47d158ab3ea 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -36,8 +36,6 @@ #include "wine/heap.h" #include "wine/test.h" -static const WCHAR emptyW[] = {0}; - #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -537,27 +535,22 @@ static void init_call_sequences(struct call_sequence **seq, int n) seq[i] = heap_alloc_zero(sizeof(struct call_sequence)); } -static const WCHAR szSimpleXML[] = { -'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\"','1','.','0','\"',' ','?','>','\n', -'<','B','a','n','k','A','c','c','o','u','n','t','>','\n', -' ',' ',' ','<','N','u','m','b','e','r','>','1','2','3','4','<','/','N','u','m','b','e','r','>','\n', -' ',' ',' ','<','N','a','m','e','>','C','a','p','t','a','i','n',' ','A','h','a','b','<','/','N','a','m','e','>','\n', -'<','/','B','a','n','k','A','c','c','o','u','n','t','>','\n','\0' -}; +static const WCHAR szSimpleXML[] = -static const WCHAR carriage_ret_test[] = { -'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','"','1','.','0','"','?','>','\r','\n', -'<','B','a','n','k','A','c','c','o','u','n','t','>','\r','\n', -'\t','<','N','u','m','b','e','r','>','1','2','3','4','<','/','N','u','m','b','e','r','>','\r','\n', -'\t','<','N','a','m','e','>','C','a','p','t','a','i','n',' ','A','h','a','b','<','/','N','a','m','e','>','\r','\n', -'<','/','B','a','n','k','A','c','c','o','u','n','t','>','\r','\n','\0' -}; +L"<?xml version=\"1.0\" ?>\n" +"<BankAccount>\n" +" <Number>1234</Number>\n" +" <Name>Captain Ahab</Name>\n" +"</BankAccount>\n"; -static const WCHAR szUtf16XML[] = { -'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','"','1','.','0','"',' ', -'e','n','c','o','d','i','n','g','=','"','U','T','F','-','1','6','"',' ', -'s','t','a','n','d','a','l','o','n','e','=','"','n','o','"','?','>','\r','\n' -}; +static const WCHAR carriage_ret_test[] = + +L"<?xml version=\"1.0\"?>\r\n" +"<BankAccount>\r\n\t<Number>1234</Number>\r\n\t" +"<Name>Captain Ahab</Name>\r\n" +"</BankAccount>\r\n"; + +static const WCHAR szUtf16XML[] = L"<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n"; static const CHAR szUtf16BOM[] = {0xff, 0xfe}; @@ -2150,7 +2143,6 @@ static void test_saxreader(void) ULONG written; HANDLE file; static const CHAR testXmlA[] = "test.xml"; - static const WCHAR testXmlW[] = {'t','e','s','t','.','x','m','l',0}; IXMLDOMDocument *doc; char seqname[50]; VARIANT_BOOL v; @@ -2324,7 +2316,7 @@ static void test_saxreader(void) else test_seq = content_handler_test1; set_expected_seq(test_seq); - hr = ISAXXMLReader_parseURL(reader, testXmlW); + hr = ISAXXMLReader_parseURL(reader, L"test.xml"); EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test 1: from file url", FALSE); @@ -2335,7 +2327,7 @@ static void test_saxreader(void) else test_seq = content_handler_testerror; set_expected_seq(test_seq); - hr = ISAXXMLReader_parseURL(reader, testXmlW); + hr = ISAXXMLReader_parseURL(reader, L"test.xml"); EXPECT_HR(hr, E_FAIL); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test error", FALSE); @@ -2345,14 +2337,14 @@ static void test_saxreader(void) { test_seq = content_handler_test_callback_rets_alt; set_expected_seq(test_seq); - hr = ISAXXMLReader_parseURL(reader, testXmlW); + hr = ISAXXMLReader_parseURL(reader, L"test.xml"); EXPECT_HR(hr, S_OK); } else { test_seq = content_handler_test_callback_rets; set_expected_seq(test_seq); - hr = ISAXXMLReader_parseURL(reader, testXmlW); + hr = ISAXXMLReader_parseURL(reader, L"test.xml"); EXPECT_HR(hr, S_FALSE); } ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content callback ret values", FALSE); @@ -2905,7 +2897,6 @@ static const struct enc_test_entry_t encoding_test_data[] = { static void test_saxreader_encoding(void) { const struct enc_test_entry_t *entry = encoding_test_data; - static const WCHAR testXmlW[] = {'t','e','s','t','.','x','m','l',0}; static const CHAR testXmlA[] = "test.xml"; while (entry->guid) @@ -2929,7 +2920,7 @@ static void test_saxreader_encoding(void) WriteFile(file, UTF8BOMTest, sizeof(UTF8BOMTest)-1, &written, NULL); CloseHandle(file); - hr = ISAXXMLReader_parseURL(reader, testXmlW); + hr = ISAXXMLReader_parseURL(reader, L"test.xml"); todo_wine_if(entry->todo) ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid); @@ -3098,8 +3089,6 @@ static void test_mxwriter_default_properties(const struct mxwriter_props_t *tabl static void test_mxwriter_properties(void) { - static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; - static const WCHAR testW[] = {'t','e','s','t',0}; ISAXContentHandler *content; IMXWriter *writer; VARIANT_BOOL b; @@ -3144,7 +3133,7 @@ static void test_mxwriter_properties(void) str = (void*)0xdeadbeef; hr = IMXWriter_get_encoding(writer, &str); EXPECT_HR(hr, S_OK); - ok(lstrcmpW(str, utf16W) == 0, "expected empty string, got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"UTF-16"), "Unexpected string %s.\n", wine_dbgstr_w(str)); str2 = (void*)0xdeadbeef; hr = IMXWriter_get_encoding(writer, &str2); @@ -3155,7 +3144,7 @@ static void test_mxwriter_properties(void) SysFreeString(str); /* put empty string */ - str = SysAllocString(emptyW); + str = SysAllocString(L""); hr = IMXWriter_put_encoding(writer, str); ok(hr == E_INVALIDARG, "got %08x\n", hr); SysFreeString(str); @@ -3167,7 +3156,7 @@ static void test_mxwriter_properties(void) SysFreeString(str); /* invalid encoding name */ - str = SysAllocString(testW); + str = SysAllocString(L"test"); hr = IMXWriter_put_encoding(writer, str); ok(hr == E_INVALIDARG, "got %08x\n", hr); SysFreeString(str); @@ -3346,7 +3335,7 @@ static void test_mxwriter_flush(void) hr = ISAXContentHandler_startDocument(content); EXPECT_HR(hr, S_OK); - hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1, NULL); + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, _bstr_("a"), -1, NULL); EXPECT_HR(hr, S_OK); /* internal buffer is flushed automatically on certain threshold */ @@ -3394,7 +3383,7 @@ static void test_mxwriter_flush(void) hr = ISAXContentHandler_startDocument(content); EXPECT_HR(hr, S_OK); - hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1, NULL); + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, _bstr_("a"), -1, NULL); EXPECT_HR(hr, S_OK); pos.QuadPart = 0; @@ -3425,7 +3414,7 @@ static void test_mxwriter_flush(void) hr = ISAXContentHandler_startDocument(content); EXPECT_HR(hr, S_OK); - hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1, NULL); + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, _bstr_("a"), -1, NULL); EXPECT_HR(hr, S_OK); memset(buff, 'A', len); @@ -3971,7 +3960,6 @@ static const struct writer_characters_t writer_characters[] = { static void test_mxwriter_characters(void) { - static const WCHAR chardataW[] = {'T','E','S','T','C','H','A','R','D','A','T','A',' ','.',0}; static const WCHAR embedded_nullbytes[] = {'a',0,'b',0,0,0,'c',0}; const struct writer_characters_t *table = writer_characters; IVBSAXContentHandler *vb_content; @@ -4001,14 +3989,14 @@ static void test_mxwriter_characters(void) hr = ISAXContentHandler_characters(content, NULL, 0); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXContentHandler_characters(content, chardataW, 0); + hr = ISAXContentHandler_characters(content, L"TESTCHARDATA .", 0); EXPECT_HR(hr, S_OK); str = _bstr_("VbChars"); hr = IVBSAXContentHandler_characters(vb_content, &str); EXPECT_HR(hr, S_OK); - hr = ISAXContentHandler_characters(content, chardataW, ARRAY_SIZE(chardataW) - 1); + hr = ISAXContentHandler_characters(content, L"TESTCHARDATA .", 14); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -4042,7 +4030,7 @@ static void test_mxwriter_characters(void) hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("a"), 1, NULL); EXPECT_HR(hr, S_OK); - hr = ISAXContentHandler_characters(content, chardataW, 0); + hr = ISAXContentHandler_characters(content, L"TESTCHARDATA .", 0); EXPECT_HR(hr, S_OK); hr = ISAXContentHandler_endElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("a"), 1); @@ -4198,14 +4186,14 @@ static const mxwriter_stream_test mxwriter_stream_tests[] = { VARIANT_TRUE,"UTF-16", { {FALSE,(const BYTE*)szUtf16BOM,sizeof(szUtf16BOM),TRUE}, - {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)}, + {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)-sizeof(WCHAR)}, {TRUE} } }, { VARIANT_FALSE,"UTF-16", { - {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)}, + {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)-sizeof(WCHAR)}, {TRUE} } }, @@ -4235,7 +4223,7 @@ static const mxwriter_stream_test mxwriter_stream_tests[] = { VARIANT_TRUE,"UTF-16", { {FALSE,(const BYTE*)szUtf16BOM,sizeof(szUtf16BOM),TRUE}, - {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)}, + {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)-sizeof(WCHAR)}, {TRUE} } }, @@ -4243,7 +4231,7 @@ static const mxwriter_stream_test mxwriter_stream_tests[] = { VARIANT_TRUE,"UTF-16", { {FALSE,(const BYTE*)szUtf16BOM,sizeof(szUtf16BOM),TRUE,TRUE}, - {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)}, + {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)-sizeof(WCHAR)}, {TRUE} } } @@ -4536,8 +4524,6 @@ static void test_mxwriter_encoding(void) static void test_obj_dispex(IUnknown *obj) { - static const WCHAR testW[] = {'t','e','s','t','p','r','o','p',0}; - static const WCHAR starW[] = {'*',0}; DISPID dispid = DISPID_SAX_XMLREADER_GETFEATURE; IDispatchEx *dispex; IUnknown *unk; @@ -4556,7 +4542,7 @@ static void test_obj_dispex(IUnknown *obj) EXPECT_HR(hr, S_OK); ok(ticnt == 1, "ticnt=%u\n", ticnt); - name = SysAllocString(starW); + name = SysAllocString(L"*"); hr = IDispatchEx_DeleteMemberByName(dispex, name, fdexNameCaseSensitive); EXPECT_HR(hr, E_NOTIMPL); SysFreeString(name); @@ -4581,7 +4567,7 @@ static void test_obj_dispex(IUnknown *obj) EXPECT_HR(hr, E_NOTIMPL); ok(unk == (IUnknown*)0xdeadbeef, "got %p\n", unk); - name = SysAllocString(testW); + name = SysAllocString(L"testprop"); hr = IDispatchEx_GetDispID(dispex, name, fdexNameEnsure, &did); ok(hr == DISP_E_UNKNOWNNAME, "got 0x%08x\n", hr); SysFreeString(name); @@ -4689,7 +4675,6 @@ static void test_mxwriter_dispex(void) static void test_mxwriter_comment(void) { - static const WCHAR commentW[] = {'c','o','m','m','e','n','t',0}; IVBSAXLexicalHandler *vblexical; ISAXContentHandler *content; ISAXLexicalHandler *lexical; @@ -4722,7 +4707,7 @@ static void test_mxwriter_comment(void) hr = IVBSAXLexicalHandler_comment(vblexical, NULL); EXPECT_HR(hr, E_POINTER); - hr = ISAXLexicalHandler_comment(lexical, commentW, 0); + hr = ISAXLexicalHandler_comment(lexical, L"comment", 0); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -4732,7 +4717,7 @@ static void test_mxwriter_comment(void) ok(!lstrcmpW(L"\r\n", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); - hr = ISAXLexicalHandler_comment(lexical, commentW, ARRAY_SIZE(commentW) - 1); + hr = ISAXLexicalHandler_comment(lexical, L"comment", 7); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -4813,8 +4798,6 @@ static void test_mxwriter_cdata(void) static void test_mxwriter_pi(void) { - static const WCHAR targetW[] = {'t','a','r','g','e','t',0}; - static const WCHAR dataW[] = {'d','a','t','a',0}; ISAXContentHandler *content; IMXWriter *writer; VARIANT dest; @@ -4830,10 +4813,10 @@ static void test_mxwriter_pi(void) hr = ISAXContentHandler_processingInstruction(content, NULL, 0, NULL, 0); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXContentHandler_processingInstruction(content, targetW, 0, NULL, 0); + hr = ISAXContentHandler_processingInstruction(content, L"target", 0, NULL, 0); EXPECT_HR(hr, S_OK); - hr = ISAXContentHandler_processingInstruction(content, targetW, 6, NULL, 0); + hr = ISAXContentHandler_processingInstruction(content, L"target", 6, NULL, 0); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -4843,7 +4826,7 @@ static void test_mxwriter_pi(void) ok(!lstrcmpW(L"<?\?>\r\n<?target?>\r\n", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); - hr = ISAXContentHandler_processingInstruction(content, targetW, 4, dataW, 4); + hr = ISAXContentHandler_processingInstruction(content, L"target", 4, L"data", 4); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -4857,7 +4840,7 @@ static void test_mxwriter_pi(void) hr = IMXWriter_put_output(writer, dest); EXPECT_HR(hr, S_OK); - hr = ISAXContentHandler_processingInstruction(content, targetW, 6, dataW, 0); + hr = ISAXContentHandler_processingInstruction(content, L"target", 6, L"data", 0); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -4874,7 +4857,6 @@ static void test_mxwriter_pi(void) static void test_mxwriter_ignorablespaces(void) { - static const WCHAR dataW[] = {'d','a','t','a',0}; ISAXContentHandler *content; IMXWriter *writer; VARIANT dest; @@ -4890,13 +4872,13 @@ static void test_mxwriter_ignorablespaces(void) hr = ISAXContentHandler_ignorableWhitespace(content, NULL, 0); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXContentHandler_ignorableWhitespace(content, dataW, 0); + hr = ISAXContentHandler_ignorableWhitespace(content, L"data", 0); EXPECT_HR(hr, S_OK); - hr = ISAXContentHandler_ignorableWhitespace(content, dataW, 4); + hr = ISAXContentHandler_ignorableWhitespace(content, L"data", 4); EXPECT_HR(hr, S_OK); - hr = ISAXContentHandler_ignorableWhitespace(content, dataW, 1); + hr = ISAXContentHandler_ignorableWhitespace(content, L"data", 1); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -4912,10 +4894,6 @@ static void test_mxwriter_ignorablespaces(void) static void test_mxwriter_dtd(void) { - static const WCHAR contentW[] = {'c','o','n','t','e','n','t'}; - static const WCHAR nameW[] = {'n','a','m','e'}; - static const WCHAR pubW[] = {'p','u','b'}; - static const WCHAR sysW[] = {'s','y','s'}; IVBSAXLexicalHandler *vblexical; ISAXContentHandler *content; ISAXLexicalHandler *lexical; @@ -4957,16 +4935,16 @@ static void test_mxwriter_dtd(void) hr = IVBSAXLexicalHandler_startDTD(vblexical, NULL, NULL, NULL); EXPECT_HR(hr, E_POINTER); - hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, pubW, ARRAY_SIZE(pubW), NULL, 0); + hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, L"pub", 3, NULL, 0); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, NULL, 0, sysW, ARRAY_SIZE(sysW)); + hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, NULL, 0, L"sys", 3); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, pubW, ARRAY_SIZE(pubW), sysW, ARRAY_SIZE(sysW)); + hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, L"pub", 3, L"sys", 3); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXLexicalHandler_startDTD(lexical, nameW, ARRAY_SIZE(nameW), NULL, 0, NULL, 0); + hr = ISAXLexicalHandler_startDTD(lexical, L"name", 4, NULL, 0, NULL, 0); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -4977,11 +4955,10 @@ static void test_mxwriter_dtd(void) VariantClear(&dest); /* system id is required if public is present */ - hr = ISAXLexicalHandler_startDTD(lexical, nameW, ARRAY_SIZE(nameW), pubW, ARRAY_SIZE(pubW), NULL, 0); + hr = ISAXLexicalHandler_startDTD(lexical, L"name", 4, L"pub", 3, NULL, 0); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXLexicalHandler_startDTD(lexical, nameW, ARRAY_SIZE(nameW), - pubW, ARRAY_SIZE(pubW), sysW, ARRAY_SIZE(sysW)); + hr = ISAXLexicalHandler_startDTD(lexical, L"name", 4, L"pub", 3, L"sys", 3); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -5018,10 +4995,10 @@ static void test_mxwriter_dtd(void) hr = IVBSAXDeclHandler_elementDecl(vbdecl, NULL, NULL); EXPECT_HR(hr, E_POINTER); - hr = ISAXDeclHandler_elementDecl(decl, nameW, ARRAY_SIZE(nameW), NULL, 0); + hr = ISAXDeclHandler_elementDecl(decl, L"name", 4, NULL, 0); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXDeclHandler_elementDecl(decl, nameW, ARRAY_SIZE(nameW), contentW, ARRAY_SIZE(contentW)); + hr = ISAXDeclHandler_elementDecl(decl, L"name", 4, L"content", 7); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -5036,7 +5013,7 @@ static void test_mxwriter_dtd(void) hr = IMXWriter_put_output(writer, dest); EXPECT_HR(hr, S_OK); - hr = ISAXDeclHandler_elementDecl(decl, nameW, ARRAY_SIZE(nameW), contentW, 0); + hr = ISAXDeclHandler_elementDecl(decl, L"name", 4, L"content", 0); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -5609,11 +5586,6 @@ static struct msxmlsupported_data_t saxattr_support_data[] = static void test_mxattr_localname(void) { - static const WCHAR localname1W[] = {'l','o','c','a','l','n','a','m','e','1',0}; - static const WCHAR localnameW[] = {'l','o','c','a','l','n','a','m','e',0}; - static const WCHAR uri1W[] = {'u','r','i','1',0}; - static const WCHAR uriW[] = {'u','r','i',0}; - const struct msxmlsupported_data_t *table = saxattr_support_data; while (table->clsid) @@ -5648,17 +5620,17 @@ static void test_mxattr_localname(void) EXPECT_HR(hr, S_OK); index = -1; - hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localnameW, lstrlenW(localnameW), &index); + hr = ISAXAttributes_getIndexFromName(saxattr, L"uri", 3, L"localname", 9, &index); EXPECT_HR(hr, S_OK); ok(index == 0, "%s: got index %d\n", table->name, index); index = -1; - hr = ISAXAttributes_getIndexFromName(saxattr, uri1W, lstrlenW(uri1W), localnameW, lstrlenW(localnameW), &index); + hr = ISAXAttributes_getIndexFromName(saxattr, L"uri1", 4, L"localname", 9, &index); EXPECT_HR(hr, E_INVALIDARG); ok(index == -1, "%s: got index %d\n", table->name, index); index = -1; - hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localname1W, lstrlenW(localname1W), &index); + hr = ISAXAttributes_getIndexFromName(saxattr, L"uri", 3, L"localname1", 10, &index); EXPECT_HR(hr, E_INVALIDARG); ok(index == -1, "%s: got index %d\n", table->name, index); @@ -5668,7 +5640,7 @@ static void test_mxattr_localname(void) hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, NULL, 0, NULL); EXPECT_HR(hr, E_POINTER); - hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localname1W, lstrlenW(localname1W), NULL); + hr = ISAXAttributes_getIndexFromName(saxattr, L"uri", 3, L"localname1", 10, NULL); EXPECT_HR(hr, E_POINTER); } else @@ -5676,14 +5648,14 @@ static void test_mxattr_localname(void) hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, NULL, 0, NULL); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localname1W, lstrlenW(localname1W), NULL); + hr = ISAXAttributes_getIndexFromName(saxattr, L"uri", 3, L"localname1", 10, NULL); EXPECT_HR(hr, E_INVALIDARG); } - hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), NULL, 0, &index); + hr = ISAXAttributes_getIndexFromName(saxattr, L"uri", 3, NULL, 0, &index); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, localname1W, lstrlenW(localname1W), &index); + hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, L"localname1", 10, &index); EXPECT_HR(hr, E_INVALIDARG); table++; @@ -5713,25 +5685,25 @@ static void test_mxwriter_indent(void) hr = ISAXContentHandler_startDocument(content); ok(hr == S_OK, "got %08x\n", hr); - hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1, NULL); + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, _bstr_("a"), -1, NULL); ok(hr == S_OK, "got %08x\n", hr); hr = ISAXContentHandler_characters(content, _bstr_(""), 0); ok(hr == S_OK, "got %08x\n", hr); - hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("b"), -1, NULL); + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, _bstr_("b"), -1, NULL); ok(hr == S_OK, "got %08x\n", hr); - hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("c"), -1, NULL); + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, _bstr_("c"), -1, NULL); ok(hr == S_OK, "got %08x\n", hr); - hr = ISAXContentHandler_endElement(content, emptyW, 0, emptyW, 0, _bstr_("c"), -1); + hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, _bstr_("c"), -1); ok(hr == S_OK, "got %08x\n", hr); - hr = ISAXContentHandler_endElement(content, emptyW, 0, emptyW, 0, _bstr_("b"), -1); + hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, _bstr_("b"), -1); ok(hr == S_OK, "got %08x\n", hr); - hr = ISAXContentHandler_endElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1); + hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, _bstr_("a"), -1); ok(hr == S_OK, "got %08x\n", hr); hr = ISAXContentHandler_endDocument(content); diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 4637d62f8b2..d1622ffc7da 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -37,14 +37,6 @@ #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) -static const WCHAR xdr_schema_uri[] = {'x','-','s','c','h','e','m','a',':','t','e','s','t','.','x','m','l',0}; - -static const WCHAR xdr_schema_xml[] = { - '<','S','c','h','e','m','a',' ','x','m','l','n','s','=','\"','u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','x','m','l','-','d','a','t','a','\"','\n', - 'x','m','l','n','s',':','d','t','=','\"','u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','d','a','t','a','t','y','p','e','s','\"','>','\n', - '<','/','S','c','h','e','m','a','>','\n',0 -}; - static const CHAR xdr_schema1_uri[] = "x-schema:test1.xdr"; static const CHAR xdr_schema1_xml[] = "<?xml version='1.0'?>" @@ -498,7 +490,8 @@ static void* _create_object(const GUID *clsid, const char *name, const IID *iid, static void test_schema_refs(void) { - static const WCHAR emptyW[] = {0}; + static const WCHAR xdr_schema_xml[] = + L"<Schema xmlns=\"urn:schemas-microsoft-com:xml-data\"\nxmlns:dt=\"urn:schemas-microsoft-com:datatypes\">\n</Schema>\n"; IXMLDOMDocument2 *doc; IXMLDOMNode *node; IXMLDOMSchemaCollection *cache; @@ -546,7 +539,7 @@ static void test_schema_refs(void) IXMLDOMNode_Release(node); node = NULL; - str = SysAllocString(emptyW); + str = SysAllocString(L""); ole_check(IXMLDOMSchemaCollection_get(cache, str, &node)); ok(node != NULL, "%p\n", node); IXMLDOMNode_Release(node); @@ -576,7 +569,7 @@ static void test_schema_refs(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(len == 0, "got %d\n", len); - str = SysAllocString(xdr_schema_uri); + str = SysAllocString(L"x-schema:test.xml"); ole_check(IXMLDOMSchemaCollection_add(cache, str, _variantdoc_(doc))); /* IXMLDOMSchemaCollection_add doesn't add a ref on doc */ @@ -1430,8 +1423,6 @@ static void test_validate_on_load(void) static void test_obj_dispex(IUnknown *obj) { - static const WCHAR testW[] = {'t','e','s','t','p','r','o','p',0}; - static const WCHAR starW[] = {'*',0}; DISPID dispid = DISPID_SAX_XMLREADER_GETFEATURE; IDispatchEx *dispex; IUnknown *unk; @@ -1449,7 +1440,7 @@ static void test_obj_dispex(IUnknown *obj) EXPECT_HR(hr, S_OK); ok(ticnt == 1, "ticnt=%u\n", ticnt); - name = SysAllocString(starW); + name = SysAllocString(L"*"); hr = IDispatchEx_DeleteMemberByName(dispex, name, fdexNameCaseSensitive); EXPECT_HR(hr, E_NOTIMPL); SysFreeString(name); @@ -1474,7 +1465,7 @@ static void test_obj_dispex(IUnknown *obj) EXPECT_HR(hr, E_NOTIMPL); ok(unk == (IUnknown*)0xdeadbeef, "got %p\n", unk); - name = SysAllocString(testW); + name = SysAllocString(L"testprop"); hr = IDispatchEx_GetDispID(dispex, name, fdexNameEnsure, &dispid); ok(hr == DISP_E_UNKNOWNNAME, "got 0x%08x\n", hr); SysFreeString(name); diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 8854e0e2fa8..7ad6e3177f7 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -95,14 +95,6 @@ static void test_xmldoc(void) HRESULT hr; BSTR name; - static const WCHAR szBankAccount[] = {'B','A','N','K','A','C','C','O','U','N','T',0}; - static const WCHAR szNumber[] = {'N','U','M','B','E','R',0}; - static const WCHAR szNumVal[] = {'1','2','3','4',0}; - static const WCHAR szName[] = {'N','A','M','E',0}; - static const WCHAR szNameVal[] = {'C','a','p','t','a','i','n',' ','A','h','a','b',0}; - static const WCHAR szVersion[] = {'1','.','0',0}; - static const WCHAR rootW[] = {'r','o','o','t',0}; - hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (void**)&doc); EXPECT_HR(hr, S_OK); @@ -117,7 +109,7 @@ static void test_xmldoc(void) name = NULL; hr = ITypeInfo_GetDocumentation(ti, DISPID_XMLDOCUMENT_ROOT, &name, NULL, NULL, NULL); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(name, rootW), "got name %s\n", wine_dbgstr_w(name)); + ok(!lstrcmpW(name, L"root"), "got name %s\n", wine_dbgstr_w(name)); SysFreeString(name); ITypeInfo_Release(ti); @@ -152,7 +144,7 @@ static void test_xmldoc(void) name = NULL; hr = IXMLDocument_get_version(doc, &name); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(name, szVersion), "Expected 1.0, got %s\n", wine_dbgstr_w(name)); + ok(!lstrcmpW(name, L"1.0"), "Expected 1.0, got %s\n", wine_dbgstr_w(name)); SysFreeString(name); /* doctype */ @@ -161,7 +153,7 @@ static void test_xmldoc(void) hr = IXMLDocument_get_doctype(doc, &name); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(name, szBankAccount), "Expected BANKACCOUNT, got %s\n", wine_dbgstr_w(name)); + ok(!lstrcmpW(name, L"BANKACCOUNT"), "Expected BANKACCOUNT, got %s\n", wine_dbgstr_w(name)); SysFreeString(name); hr = IXMLDocument_get_root(doc, &element); @@ -181,7 +173,7 @@ static void test_xmldoc(void) hr = IXMLElement_get_tagName(element, &name); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(name, szBankAccount), "Expected BANKACCOUNT\n"); + ok(!lstrcmpW(name, L"BANKACCOUNT"), "Expected BANKACCOUNT\n"); SysFreeString(name); hr = IXMLElement_get_children(element, &collection); @@ -206,7 +198,7 @@ static void test_xmldoc(void) hr = IXMLElement_get_tagName(child, &name); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(name, szNumber), "Expected NUMBER\n"); + ok(!lstrcmpW(name, L"NUMBER"), "Expected NUMBER\n"); SysFreeString(name); hr = IXMLElement_get_children(child, &inner); @@ -227,7 +219,7 @@ static void test_xmldoc(void) hr = IXMLElement_get_text(value, &name); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(name, szNumVal), "Expected '1234'\n"); + ok(!lstrcmpW(name, L"1234"), "Expected '1234'\n"); SysFreeString(name); IXMLElementCollection_Release(inner); @@ -253,7 +245,7 @@ static void test_xmldoc(void) hr = IXMLElement_get_tagName(child, &name); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(name, szName), "Expected NAME\n"); + ok(!lstrcmpW(name, L"NAME"), "Expected NAME\n"); SysFreeString(name); hr = IXMLElement_get_children(child, &inner); @@ -275,7 +267,7 @@ static void test_xmldoc(void) hr = IXMLElement_get_text(value, &name); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(name, szNameVal), "Expected 'Captain Ahab'\n"); + ok(!lstrcmpW(name, L"Captain Ahab"), "Expected 'Captain Ahab'\n"); SysFreeString(name); IXMLElementCollection_Release(inner); @@ -398,7 +390,6 @@ static void test_persiststreaminit(void) CHAR path[MAX_PATH]; CLSID id; BSTR str; - static const WCHAR testW[] = {'t','e','s','t',0}; hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); @@ -456,7 +447,7 @@ static void test_persiststreaminit(void) todo_wine ok(stat.cbSize.QuadPart > 0, "Expected >0\n"); IStream_Release(stream); - str = SysAllocString(testW); + str = SysAllocString(L"test"); hr = IXMLDocument_get_root(doc, &element); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); hr = IXMLElement_put_text(element, str); @@ -658,16 +649,13 @@ static void test_xmlelem_collection(void) ULONG num_vars; VARIANT var[3], dummy, vIndex, vName; BSTR url, str; - static const CHAR szBankXML[] = "bank.xml"; - static const WCHAR szNumber[] = {'N','U','M','B','E','R',0}; - static const WCHAR szName[] = {'N','A','M','E',0}; hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); - create_xml_file(szBankXML); - GetFullPathNameA(szBankXML, MAX_PATH, pathA, NULL); + create_xml_file("bank.xml"); + GetFullPathNameA("bank.xml", MAX_PATH, pathA, NULL); MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); url = SysAllocString(path); @@ -755,7 +743,7 @@ static void test_xmlelem_collection(void) hr = IXMLElement_get_tagName(child, &str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(str, szNumber), "Expected NUMBER\n"); + ok(!lstrcmpW(str, L"NUMBER"), "Expected NUMBER\n"); SysFreeString(str); IXMLElement_Release(child); @@ -822,7 +810,7 @@ static void test_xmlelem_collection(void) hr = IXMLElement_get_tagName(child, &str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(str, szName), "Expected NAME\n"); + ok(!lstrcmpW(str, L"NAME"), "Expected NAME\n"); SysFreeString(str); IXMLElement_Release(child); @@ -841,7 +829,7 @@ static void test_xmlelem_collection(void) hr = IXMLElement_get_tagName(child, &str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(str, szNumber), "Expected NUMBER\n"); + ok(!lstrcmpW(str, L"NUMBER"), "Expected NUMBER\n"); SysFreeString(str); IXMLElement_Release(child); @@ -860,7 +848,7 @@ static void test_xmlelem_collection(void) hr = IXMLElement_get_tagName(child, &str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(str, szName), "Expected NAME\n"); + ok(!lstrcmpW(str, L"NAME"), "Expected NAME\n"); SysFreeString(str); IXMLElement_Release(child); @@ -897,13 +885,6 @@ static void test_xmlelem(void) IDispatch *disp; ITypeInfo *ti; - static const WCHAR propName[] = {'p','r','o','p',0}; - static const WCHAR propVal[] = {'v','a','l',0}; - static const WCHAR nextVal[] = {'n','e','x','t',0}; - static const WCHAR noexist[] = {'n','o','e','x','i','s','t',0}; - static const WCHAR crazyCase1[] = {'C','R','a','z','Y','c','A','S','E',0}; - static const WCHAR crazyCase2[] = {'C','R','A','Z','Y','C','A','S','E',0}; - hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); EXPECT_HR(hr, S_OK); @@ -941,7 +922,7 @@ static void test_xmlelem(void) ok(hr == 1, "Expected 1, got %08x\n", hr); ok(parent == NULL, "Expected NULL parent\n"); - str = SysAllocString(noexist); + str = SysAllocString(L"noexist"); hr = IXMLElement_getAttribute(element, str, &vValue); ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); ok(V_VT(&vValue) == VT_EMPTY, "Expected VT_EMPTY, got %d\n", V_VT(&vValue)); @@ -949,8 +930,8 @@ static void test_xmlelem(void) VariantClear(&vValue); SysFreeString(str); - str = SysAllocString(crazyCase1); - val = SysAllocString(propVal); + str = SysAllocString(L"CRazYcASE"); + val = SysAllocString(L"val"); V_VT(&vValue) = VT_BSTR; V_BSTR(&vValue) = val; hr = IXMLElement_setAttribute(element, str, vValue); @@ -958,16 +939,16 @@ static void test_xmlelem(void) SysFreeString(str); SysFreeString(val); - str = SysAllocString(crazyCase2); + str = SysAllocString(L"CRAZYCASE"); hr = IXMLElement_getAttribute(element, str, &vValue); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(V_VT(&vValue) == VT_BSTR, "Expected VT_BSTR, got %d\n", V_VT(&vValue)); - ok(!lstrcmpW(V_BSTR(&vValue), propVal), "Expected 'val'\n"); + ok(!lstrcmpW(V_BSTR(&vValue), L"val"), "Expected 'val'\n"); VariantClear(&vValue); SysFreeString(str); - str = SysAllocString(propName); - val = SysAllocString(propVal); + str = SysAllocString(L"prop"); + val = SysAllocString(L"val"); V_VT(&vValue) = VT_BSTR; V_BSTR(&vValue) = val; hr = IXMLElement_setAttribute(element, str, vValue); @@ -977,7 +958,7 @@ static void test_xmlelem(void) hr = IXMLElement_getAttribute(element, str, &vValue); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(V_VT(&vValue) == VT_BSTR, "Expected VT_BSTR, got %d\n", V_VT(&vValue)); - ok(!lstrcmpW(V_BSTR(&vValue), propVal), "Expected 'val'\n"); + ok(!lstrcmpW(V_BSTR(&vValue), L"val"), "Expected 'val'\n"); VariantClear(&vValue); hr = IXMLElement_removeAttribute(element, str); @@ -1009,7 +990,7 @@ static void test_xmlelem(void) SysFreeString(str); /* put_text with an ELEMENT */ - str = SysAllocString(propVal); + str = SysAllocString(L"val"); hr = IXMLElement_put_text(element, str); ok(hr == E_NOTIMPL, "Expected E_NOTIMPL, got %08x\n", hr); SysFreeString(str); @@ -1024,7 +1005,7 @@ static void test_xmlelem(void) hr = IXMLElement_addChild(element, child, 0, -1); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - str = SysAllocString(propVal); + str = SysAllocString(L"val"); hr = IXMLElement_put_text(child, str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); SysFreeString(str); @@ -1061,28 +1042,28 @@ static void test_xmlelem(void) hr = IXMLElement_get_text(element, &str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(str, propVal), "Expected 'val'\n"); + ok(!lstrcmpW(str, L"val"), "Expected 'val'\n"); SysFreeString(str); hr = IXMLElement_get_text(child2, &str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(str, propVal), "Expected 'val'\n"); + ok(!lstrcmpW(str, L"val"), "Expected 'val'\n"); SysFreeString(str); /* try put_text on ELEMENT again, now that it has a text child */ - str = SysAllocString(nextVal); + str = SysAllocString(L"next"); hr = IXMLElement_put_text(element, str); ok(hr == E_NOTIMPL, "Expected E_NOTIMPL, got %08x\n", hr); SysFreeString(str); - str = SysAllocString(nextVal); + str = SysAllocString(L"next"); hr = IXMLElement_put_text(child2, str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); SysFreeString(str); hr = IXMLElement_get_text(element, &str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(str, nextVal), "Expected 'val'\n"); + ok(!lstrcmpW(str, L"next"), "Expected 'val'\n"); SysFreeString(str); IXMLElement_Release(child2); diff --git a/dlls/msxml3/tests/xmlview.c b/dlls/msxml3/tests/xmlview.c index 53eefcb7e00..01e6dedab3f 100644 --- a/dlls/msxml3/tests/xmlview.c +++ b/dlls/msxml3/tests/xmlview.c @@ -121,14 +121,15 @@ static HRESULT WINAPI HTMLEvents_Invoke(IDispatch *iface, DISPID dispIdMember, R LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - if(dispIdMember == DISPID_HTMLDOCUMENTEVENTS2_ONREADYSTATECHANGE) { - static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0}; + if (dispIdMember == DISPID_HTMLDOCUMENTEVENTS2_ONREADYSTATECHANGE) + { + static const WCHAR completeW[] = L"complete"; HRESULT hr; BSTR state; hr = IHTMLDocument2_get_readyState(html_doc, &state); ok(hr == S_OK, "got 0x%08x\n", hr); - if(!memcmp(state, completeW, sizeof(completeW))) + if (!memcmp(state, completeW, sizeof(completeW))) loaded = TRUE; SysFreeString(state); } @@ -191,9 +192,6 @@ static void test_QueryInterface(void) static void test_Load(void) { - static const WCHAR xmlview_xmlW[] = {'/','x','m','l','/','x','m','l','v','i','e','w','.','x','m','l',0}; - static const WCHAR res[] = {'r','e','s',':','/','/',0}; - WCHAR buf[1024]; IPersistMoniker *pers_mon; IConnectionPointContainer *cpc; @@ -205,9 +203,9 @@ static void test_Load(void) MSG msg; BSTR source; - lstrcpyW(buf, res); - GetModuleFileNameW(NULL, buf+lstrlenW(buf), ARRAY_SIZE(buf)-ARRAY_SIZE(res)); - lstrcatW(buf, xmlview_xmlW); + lstrcpyW(buf, L"res://"); + GetModuleFileNameW(NULL, buf+lstrlenW(buf), ARRAY_SIZE(buf)-ARRAY_SIZE(L"res://")); + lstrcatW(buf, L"/xml/xmlview.xml"); if(!pCreateURLMoniker) { win_skip("CreateURLMoniker not available\n"); -- 2.28.0

2 2

[PATCH 1/5] evr/presenter: Validate mixer's device id.
by Nikolay Sivov 05 Oct '20

05 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 55 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 04e9a556840..4a7a4021c28 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -357,6 +357,41 @@ static ULONG WINAPI video_presenter_service_client_Release(IMFTopologyServiceLoo return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); } +static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) +{ + IMFVideoDeviceID *device_id; + unsigned int count; + GUID id = { 0 }; + HRESULT hr; + + count = 1; + 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); + return hr; + } + + if (SUCCEEDED(hr = IMFTransform_QueryInterface(presenter->mixer, &IID_IMFVideoDeviceID, (void **)&device_id))) + { + if (SUCCEEDED(hr = IMFVideoDeviceID_GetDeviceID(device_id, &id))) + { + if (!IsEqualGUID(&id, &IID_IDirect3DDevice9)) + hr = MF_E_INVALIDREQUEST; + } + + IMFVideoDeviceID_Release(device_id); + } + + if (FAILED(hr)) + { + IMFTransform_Release(presenter->mixer); + presenter->mixer = NULL; + } + + return hr; +} + static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopologyServiceLookupClient *iface, IMFTopologyServiceLookup *service_lookup) { @@ -384,20 +419,16 @@ static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopo IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, &MR_VIDEO_RENDER_SERVICE, &IID_IMFClock, (void **)&presenter->clock, &count); - count = 1; - if (SUCCEEDED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, - &MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, (void **)&presenter->mixer, &count))) - { - /* FIXME: presumably should validate mixer's device id. */ - } - else - WARN("Failed to get mixer interface, hr %#x.\n", hr); + hr = video_presenter_attach_mixer(presenter, service_lookup); - count = 1; - if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, - &MR_VIDEO_RENDER_SERVICE, &IID_IMediaEventSink, (void **)&presenter->event_sink, &count))) + if (SUCCEEDED(hr)) { - WARN("Failed to get renderer event sink, hr %#x.\n", hr); + count = 1; + 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); + } } if (SUCCEEDED(hr)) -- 2.28.0

1 4

[PATCH] rtworkq: Add remaining queue management stubs.
by Nikolay Sivov 05 Oct '20

05 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mfplat.spec | 6 +++--- dlls/rtworkq/queue.c | 21 +++++++++++++++++++++ dlls/rtworkq/rtworkq.spec | 6 +++--- include/mfapi.h | 3 +++ include/rtworkq.idl | 2 ++ 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index f55a8237d35..8f5e7db6aee 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -25,7 +25,7 @@ @ stub MFBeginGetHostByName @ stub MFBeginRegisterWorkQueueWithMMCSS @ stdcall MFBeginRegisterWorkQueueWithMMCSSEx(long wstr long long ptr ptr) rtworkq.RtwqBeginRegisterWorkQueueWithMMCSS -@ stub MFBeginUnregisterWorkQueueWithMMCSS +@ stdcall MFBeginUnregisterWorkQueueWithMMCSS(long ptr ptr) rtworkq.RtwqBeginUnregisterWorkQueueWithMMCSS @ stub MFBlockThread @ stub MFCalculateBitmapImageSize @ stdcall MFCalculateImageSize(ptr long long ptr) @@ -87,8 +87,8 @@ @ stub MFDeserializePresentationDescriptor @ stdcall MFEndCreateFile(ptr ptr) @ stub MFEndGetHostByName -@ stub MFEndRegisterWorkQueueWithMMCSS -@ stub MFEndUnregisterWorkQueueWithMMCSS +@ stdcall MFEndRegisterWorkQueueWithMMCSS(ptr ptr) rtworkq.RtwqEndRegisterWorkQueueWithMMCSS +@ stdcall MFEndUnregisterWorkQueueWithMMCSS(ptr) rtworkq.RtwqEndUnregisterWorkQueueWithMMCSS @ stub MFFrameRateToAverageTimePerFrame @ stub MFFreeAdaptersAddresses @ stub MFGetAdaptersAddresses diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 07d124cfb73..f4e9f10d3f0 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -1533,6 +1533,27 @@ HRESULT WINAPI RtwqBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *cla return E_NOTIMPL; } +HRESULT WINAPI RtwqEndRegisterWorkQueueWithMMCSS(IRtwqAsyncResult *result, DWORD *taskid) +{ + FIXME("%p, %p.\n", result, taskid); + + return E_NOTIMPL; +} + +HRESULT WINAPI RtwqBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IRtwqAsyncCallback *callback, IUnknown *state) +{ + FIXME("%#x, %p, %p.\n", queue, callback, state); + + return E_NOTIMPL; +} + +HRESULT WINAPI RtwqEndUnregisterWorkQueueWithMMCSS(IRtwqAsyncResult *result) +{ + FIXME("%p.\n", result); + + return E_NOTIMPL; +} + HRESULT WINAPI RtwqRegisterPlatformEvents(IRtwqPlatformEvents *events) { FIXME("%p.\n", events); diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index 09d877790d5..2200b0863bd 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -2,13 +2,13 @@ @ stdcall RtwqAllocateSerialWorkQueue(long ptr) @ stdcall RtwqAllocateWorkQueue(long ptr) @ stdcall RtwqBeginRegisterWorkQueueWithMMCSS(long wstr long long ptr ptr) -@ stub RtwqBeginUnregisterWorkQueueWithMMCSS +@ stdcall RtwqBeginUnregisterWorkQueueWithMMCSS(long ptr ptr) @ stdcall RtwqCancelDeadline(long) @ stub RtwqCancelMultipleWaitingWorkItem @ stdcall RtwqCancelWorkItem(int64) @ stdcall RtwqCreateAsyncResult(ptr ptr ptr ptr) -@ stub RtwqEndRegisterWorkQueueWithMMCSS -@ stub RtwqEndUnregisterWorkQueueWithMMCSS +@ stdcall RtwqEndRegisterWorkQueueWithMMCSS(ptr ptr) +@ stdcall RtwqEndUnregisterWorkQueueWithMMCSS(ptr) @ stub RtwqGetPlatform @ stdcall RtwqGetWorkQueueMMCSSClass(long ptr ptr) @ stdcall RtwqGetWorkQueueMMCSSPriority(long ptr) diff --git a/include/mfapi.h b/include/mfapi.h index b1edeac02f6..e9b26f322c3 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -490,6 +490,7 @@ HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMOD const WCHAR *path, IMFAsyncCallback *callback, IUnknown *state, IUnknown **cancel_cookie); HRESULT WINAPI MFBeginRegisterWorkQueueWithMMCSSEx(DWORD queue, const WCHAR *usage_class, DWORD taskid, LONG priority, IMFAsyncCallback *callback, IUnknown *state); +HRESULT WINAPI MFBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height, UINT32 *size); HRESULT WINAPI MFCancelCreateFile(IUnknown *cancel_cookie); HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); @@ -517,6 +518,8 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMe HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *type, WAVEFORMATEX **format, UINT32 *size, UINT32 flags); HRESULT WINAPI MFEndCreateFile(IMFAsyncResult *result, IMFByteStream **stream); +HRESULT WINAPI MFEndRegisterWorkQueueWithMMCSS(IMFAsyncResult *result, DWORD *taskid); +HRESULT WINAPI MFEndUnregisterWorkQueueWithMMCSS(IMFAsyncResult *result); void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); void WINAPI MFHeapFree(void *ptr); HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, UINT size); diff --git a/include/rtworkq.idl b/include/rtworkq.idl index ed32df1c3bf..e7ff768074c 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -93,9 +93,11 @@ cpp_quote("HRESULT WINAPI RtwqAddPeriodicCallback(RTWQPERIODICCALLBACK callback, cpp_quote("HRESULT WINAPI RtwqAllocateSerialWorkQueue(DWORD target_queue, DWORD *queue);") cpp_quote("HRESULT WINAPI RtwqAllocateWorkQueue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue);") cpp_quote("HRESULT WINAPI RtwqBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *class, DWORD taskid, LONG priority, IRtwqAsyncCallback *callback, IUnknown *state);") +cpp_quote("HRESULT WINAPI RtwqBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IRtwqAsyncCallback *callback, IUnknown *state);") cpp_quote("HRESULT WINAPI RtwqCancelDeadline(HANDLE request);") cpp_quote("HRESULT WINAPI RtwqCancelWorkItem(RTWQWORKITEM_KEY key);") cpp_quote("HRESULT WINAPI RtwqCreateAsyncResult(IUnknown *object, IRtwqAsyncCallback *callback, IUnknown *state, IRtwqAsyncResult **result);") +cpp_quote("HRESULT WINAPI RtwqEndRegisterWorkQueueWithMMCSS(IRtwqAsyncResult *result, DWORD *taskid);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSClass(DWORD queue, WCHAR *class, DWORD *length);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSPriority(DWORD queue, LONG *priority);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSTaskId(DWORD queue, DWORD *taskid);") -- 2.28.0

1 0

[PATCH] comctl32/tests: Remove some workarounds from ListView tests.
by Nikolay Sivov 05 Oct '20

05 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/listview.c | 116 +++++++-------------------------- 1 file changed, 25 insertions(+), 91 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 9db3dc6ec44..e95b81f5bb1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -62,8 +62,6 @@ static NMLISTVIEW g_nmlistview_changing; /* format reported to control: -1 falls to defproc, anything else returned */ static INT notifyFormat; -/* indicates we're running < 5.80 version */ -static BOOL g_is_below_5; /* item data passed to LVN_GETDISPINFOA */ static LVITEMA g_itema; /* alter notification code A->W */ @@ -727,20 +725,6 @@ static HWND create_listview_controlW(DWORD style, HWND parent) return hwnd; } -static BOOL is_win_xp(void) -{ - HWND hwnd, header; - BOOL ret; - - hwnd = create_listview_control(LVS_ICON); - SendMessageA(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_HEADERINALLVIEWS, LVS_EX_HEADERINALLVIEWS); - header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); - ret = !IsWindow(header); - - DestroyWindow(hwnd); - - return ret; -} static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -1039,12 +1023,6 @@ static void test_checkboxes(void) item.stateMask = 0xffff; r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); expect(1, r); - if (item.state != 0x1ccc) - { - win_skip("LVS_EX_CHECKBOXES style is unavailable. Skipping.\n"); - DestroyWindow(hwnd); - return; - } /* Now add an item without specifying a state and check that its state goes to 0x1000 */ item.iItem = 2; @@ -1638,12 +1616,6 @@ static void test_create(BOOL is_version_6) DWORD style; ATOM class; - if (is_win_xp() && is_version_6) - { - win_skip("Skipping some tests on XP.\n"); - return; - } - cls.cbSize = sizeof(WNDCLASSEXA); r = GetClassInfoExA(GetModuleHandleA(NULL), WC_LISTVIEWA, &cls); ok(r, "Failed to get class info.\n"); @@ -3136,29 +3108,22 @@ static void test_ownerdata(void) DWORD res; LVITEMA item; - /* it isn't possible to set LVS_OWNERDATA after creation */ - if (g_is_below_5) - { - win_skip("set LVS_OWNERDATA after creation leads to crash on < 5.80\n"); - } - else - { - hwnd = create_listview_control(LVS_REPORT); - ok(hwnd != NULL, "failed to create a listview window\n"); - style = GetWindowLongPtrA(hwnd, GWL_STYLE); - ok(!(style & LVS_OWNERDATA) && style, "LVS_OWNERDATA isn't expected\n"); + /* Setting LVS_OWNERDATA after creation leads to crash on older versions < 5.80 */ + hwnd = create_listview_control(LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(!(style & LVS_OWNERDATA) && style, "LVS_OWNERDATA isn't expected\n"); - flush_sequences(sequences, NUM_MSG_SEQUENCES); + flush_sequences(sequences, NUM_MSG_SEQUENCES); - ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_OWNERDATA); - ok(ret == style, "Expected set GWL_STYLE to succeed\n"); - ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, - "try to switch to LVS_OWNERDATA seq", FALSE); + ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_OWNERDATA); + ok(ret == style, "Expected set GWL_STYLE to succeed\n"); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, + "try to switch to LVS_OWNERDATA seq", FALSE); - style = GetWindowLongPtrA(hwnd, GWL_STYLE); - ok(!(style & LVS_OWNERDATA), "LVS_OWNERDATA isn't expected\n"); - DestroyWindow(hwnd); - } + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(!(style & LVS_OWNERDATA), "LVS_OWNERDATA isn't expected\n"); + DestroyWindow(hwnd); /* try to set LVS_OWNERDATA after creation just having it */ hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); @@ -3174,28 +3139,20 @@ static void test_ownerdata(void) "try to switch to LVS_OWNERDATA seq", FALSE); DestroyWindow(hwnd); - /* try to remove LVS_OWNERDATA after creation just having it */ - if (g_is_below_5) - { - win_skip("remove LVS_OWNERDATA after creation leads to crash on < 5.80\n"); - } - else - { - hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); - ok(hwnd != NULL, "failed to create a listview window\n"); - style = GetWindowLongPtrA(hwnd, GWL_STYLE); - ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); + hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); - flush_sequences(sequences, NUM_MSG_SEQUENCES); + flush_sequences(sequences, NUM_MSG_SEQUENCES); - ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style & ~LVS_OWNERDATA); - ok(ret == style, "Expected set GWL_STYLE to succeed\n"); - ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, - "try to switch to LVS_OWNERDATA seq", FALSE); - style = GetWindowLongPtrA(hwnd, GWL_STYLE); - ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); - DestroyWindow(hwnd); - } + ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style & ~LVS_OWNERDATA); + ok(ret == style, "Expected set GWL_STYLE to succeed\n"); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, + "try to switch to LVS_OWNERDATA seq", FALSE); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); + DestroyWindow(hwnd); /* try select an item */ hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); @@ -4624,27 +4581,6 @@ static void test_indentation(void) DestroyWindow(hwnd); } -static INT CALLBACK DummyCompareEx(LPARAM first, LPARAM second, LPARAM param) -{ - return 0; -} - -static BOOL is_below_comctl_5(void) -{ - HWND hwnd; - BOOL ret; - - hwnd = create_listview_control(LVS_REPORT); - ok(hwnd != NULL, "failed to create a listview window\n"); - insert_item(hwnd, 0); - - ret = SendMessageA(hwnd, LVM_SORTITEMSEX, 0, (LPARAM)&DummyCompareEx); - - DestroyWindow(hwnd); - - return !ret; -} - static void test_get_set_view(void) { HWND hwnd; @@ -6700,8 +6636,6 @@ START_TEST(listview) hwndparent = create_parent_window(FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); - g_is_below_5 = is_below_comctl_5(); - test_header_notification(); test_header_notification2(); test_images(); -- 2.28.0

1 0

[PATCH vkd3d] vkd3d-common: Correctly escape whitespace characters in debugstr_*().
by Zebediah Figura 05 Oct '20

05 Oct '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-common/debug.c | 66 +++++++++++++-------------------------- 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 33deed65..5e49cf10 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -114,6 +114,24 @@ const char *vkd3d_dbg_sprintf(const char *fmt, ...) return buffer; } +static int get_escape_char(int c) +{ + switch (c) + { + case '"': + case '\\': + return c; + case '\t': + return 't'; + case '\n': + return 'n'; + case '\r': + return 'r'; + default: + return 0; + } +} + const char *debugstr_a(const char *str) { char *buffer, *ptr; @@ -127,21 +145,7 @@ const char *debugstr_a(const char *str) *ptr++ = '"'; while ((c = *str++) && ptr <= buffer + VKD3D_DEBUG_BUFFER_SIZE - 8) { - int escape_char; - - switch (c) - { - case '"': - case '\\': - case '\n': - case '\r': - case '\t': - escape_char = c; - break; - default: - escape_char = 0; - break; - } + int escape_char = get_escape_char(c); if (escape_char) { @@ -187,21 +191,7 @@ static const char *debugstr_w16(const uint16_t *wstr) *ptr++ = '"'; while ((c = *wstr++) && ptr <= buffer + VKD3D_DEBUG_BUFFER_SIZE - 10) { - int escape_char; - - switch (c) - { - case '"': - case '\\': - case '\n': - case '\r': - case '\t': - escape_char = c; - break; - default: - escape_char = 0; - break; - } + int escape_char = get_escape_char(c); if (escape_char) { @@ -247,21 +237,7 @@ static const char *debugstr_w32(const uint32_t *wstr) *ptr++ = '"'; while ((c = *wstr++) && ptr <= buffer + VKD3D_DEBUG_BUFFER_SIZE - 10) { - int escape_char; - - switch (c) - { - case '"': - case '\\': - case '\n': - case '\r': - case '\t': - escape_char = c; - break; - default: - escape_char = 0; - break; - } + int escape_char = get_escape_char(c); if (escape_char) { -- 2.28.0

2 1

[PATCH vkd3d 1/4] tests: Import HLSL struct assignment tests from Wine.
by Zebediah Figura 05 Oct '20

05 Oct '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 ++ tests/hlsl-struct-assignment.shader_test | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 tests/hlsl-struct-assignment.shader_test diff --git a/Makefile.am b/Makefile.am index 415e6862..f3a5967d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ vkd3d_shader_tests = \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-struct-assignment.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ @@ -195,6 +196,7 @@ XFAIL_TESTS = \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-struct-assignment.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/tests/hlsl-struct-assignment.shader_test b/tests/hlsl-struct-assignment.shader_test new file mode 100644 index 00000000..ea55b9ad --- /dev/null +++ b/tests/hlsl-struct-assignment.shader_test @@ -0,0 +1,23 @@ +[pixel shader] +struct apple +{ + struct + { + float4 a; + } m; + float4 b; +}; + +float4 main() : sv_target +{ + struct apple q, r, s; + + q.m.a = float4(0.1, 0.2, 0.3, 0.4); + q.b = float4(0.5, 0.1, 0.4, 0.5); + s = r = q; + return s.m.a + s.b; +} + +[test] +draw quad +probe all rgba (0.6, 0.3, 0.7, 0.9) 1 -- 2.28.0

2 7

[PATCH 1/2] msxml3/tests: Add some removeNamedItem tests.
by Daniel Lehman 05 Oct '20

05 Oct '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msxml3/tests/domdoc.c | 75 +++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 64a2e870e73..2f8e7e1993d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4064,9 +4064,9 @@ static void test_removeNamedItem(void) { IXMLDOMDocument *doc; IXMLDOMElement *element; - IXMLDOMNode *pr_node, *removed_node, *removed_node2; + IXMLDOMNode *node, *removed_node, *removed_node2; IXMLDOMNodeList *root_list; - IXMLDOMNamedNodeMap * pr_attrs; + IXMLDOMNamedNodeMap *map; VARIANT_BOOL b; BSTR str; LONG len; @@ -4084,61 +4084,102 @@ static void test_removeNamedItem(void) r = IXMLDOMElement_get_childNodes( element, &root_list ); ok( r == S_OK, "ret %08x\n", r); - r = IXMLDOMNodeList_get_item( root_list, 1, &pr_node ); + r = IXMLDOMNodeList_get_item( root_list, 1, &node ); ok( r == S_OK, "ret %08x\n", r); - r = IXMLDOMNode_get_attributes( pr_node, &pr_attrs ); + r = IXMLDOMNode_get_attributes( node, &map ); ok( r == S_OK, "ret %08x\n", r); - r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len ); + r = IXMLDOMNamedNodeMap_get_length( map, &len ); ok( r == S_OK, "ret %08x\n", r); ok( len == 3, "length %d\n", len); removed_node = (void*)0xdeadbeef; - r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, NULL, &removed_node); + r = IXMLDOMNamedNodeMap_removeNamedItem( map, NULL, &removed_node ); ok ( r == E_INVALIDARG, "ret %08x\n", r); ok ( removed_node == (void*)0xdeadbeef, "got %p\n", removed_node); removed_node = (void*)0xdeadbeef; str = SysAllocString(szvr); - r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, &removed_node); + r = IXMLDOMNamedNodeMap_removeNamedItem( map, str, &removed_node ); ok ( r == S_OK, "ret %08x\n", r); removed_node2 = (void*)0xdeadbeef; - r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, &removed_node2); + r = IXMLDOMNamedNodeMap_removeNamedItem( map, str, &removed_node2 ); ok ( r == S_FALSE, "ret %08x\n", r); ok ( removed_node2 == NULL, "got %p\n", removed_node2 ); - r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len ); + r = IXMLDOMNamedNodeMap_get_length( map, &len ); ok( r == S_OK, "ret %08x\n", r); ok( len == 2, "length %d\n", len); - r = IXMLDOMNamedNodeMap_setNamedItem( pr_attrs, removed_node, NULL); + r = IXMLDOMNamedNodeMap_setNamedItem( map, removed_node, NULL ); ok ( r == S_OK, "ret %08x\n", r); IXMLDOMNode_Release(removed_node); - r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len ); + r = IXMLDOMNamedNodeMap_get_length( map, &len ); ok( r == S_OK, "ret %08x\n", r); ok( len == 3, "length %d\n", len); - r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, NULL); + r = IXMLDOMNamedNodeMap_removeNamedItem( map, str, NULL ); ok ( r == S_OK, "ret %08x\n", r); - r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len ); + r = IXMLDOMNamedNodeMap_get_length( map, &len ); ok( r == S_OK, "ret %08x\n", r); ok( len == 2, "length %d\n", len); - r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, NULL); + r = IXMLDOMNamedNodeMap_removeNamedItem( map, str, NULL ); ok ( r == S_FALSE, "ret %08x\n", r); SysFreeString(str); - IXMLDOMNamedNodeMap_Release( pr_attrs ); - IXMLDOMNode_Release( pr_node ); + IXMLDOMNamedNodeMap_Release( map ); + IXMLDOMNode_Release( node ); IXMLDOMNodeList_Release( root_list ); IXMLDOMElement_Release( element ); - IXMLDOMDocument_Release( doc ); + /* test with namespaces */ + r = IXMLDOMDocument_loadXML( doc, _bstr_(default_ns_doc), &b ); + EXPECT_HR(r, S_OK); + + r = IXMLDOMDocument_selectSingleNode( doc, _bstr_("a"), &node ); + EXPECT_HR(r, S_OK); + + r = IXMLDOMNode_QueryInterface( node, &IID_IXMLDOMElement, (void**)&element ); + EXPECT_HR(r, S_OK); + IXMLDOMNode_Release( node ); + + r = IXMLDOMElement_get_attributes( element, &map ); + EXPECT_HR(r, S_OK); + + removed_node = (void*)0xdeadbeef; + r = IXMLDOMNamedNodeMap_removeNamedItem( map, _bstr_("foo:bar"), &removed_node ); + EXPECT_HR(r, S_FALSE); + ok ( removed_node == NULL, "got %p\n", removed_node ); + + removed_node = NULL; + r = IXMLDOMNamedNodeMap_removeNamedItem( map, _bstr_("d"), &removed_node ); + EXPECT_HR(r, S_OK); + IXMLDOMNode_Release( removed_node ); + + removed_node = NULL; + r = IXMLDOMNamedNodeMap_removeNamedItem( map, _bstr_("ns:b"), &removed_node ); + todo_wine EXPECT_HR(r, S_OK); + if (removed_node) IXMLDOMNode_Release( removed_node ); + + removed_node = NULL; + r = IXMLDOMNamedNodeMap_removeNamedItem( map, _bstr_("xml:lang"), &removed_node ); + todo_wine EXPECT_HR(r, S_OK); + if (removed_node) IXMLDOMNode_Release( removed_node ); + + len = -1; + r = IXMLDOMNamedNodeMap_get_length( map, &len ); + EXPECT_HR(r, S_OK); + todo_wine ok( len == 2, "length %d\n", len ); + + IXMLDOMNamedNodeMap_Release( map ); + IXMLDOMElement_Release( element ); + IXMLDOMDocument_Release( doc ); free_bstrs(); } -- 2.25.1

2 3

[PATCH] po: Update German translation.
by Julian Rüger 05 Oct '20

05 Oct '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

2 3

[PATCH] winex11.drv: Support reporting emulated display color depth.
by Zhiyi Zhang 05 Oct '20

05 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3drm/tests/d3drm.c | 6 ++-- dlls/user32/tests/monitor.c | 2 -- dlls/winex11.drv/settings.c | 64 +++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index d854ebcc56d..f1d48639c14 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -4061,7 +4061,7 @@ static void test_create_device_from_clipper1(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", surface_desc.ddpfPixelFormat.dwRGBBitCount); hr = IDirectDraw2_RestoreDisplayMode(ddraw); @@ -4240,7 +4240,7 @@ static void test_create_device_from_clipper2(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", surface_desc.ddpfPixelFormat.dwRGBBitCount); hr = IDirectDraw2_RestoreDisplayMode(ddraw); @@ -4418,7 +4418,7 @@ static void test_create_device_from_clipper3(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", surface_desc.ddpfPixelFormat.dwRGBBitCount); hr = IDirectDraw2_RestoreDisplayMode(ddraw); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 0ce27455a66..7664bed7427 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -297,8 +297,6 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te ok_(__FILE__, line)((dm.dmFields & expected.dmFields) == expected.dmFields, "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected.dmFields, dm.dmFields); - /* Wine doesn't support changing color depth yet */ - todo_wine_if(expected.dmFields & DM_BITSPERPEL && expected.dmBitsPerPel != 32 && expected.dmBitsPerPel != 24) ok_(__FILE__, line)(!(expected.dmFields & DM_BITSPERPEL) || dm.dmBitsPerPel == expected.dmBitsPerPel, "Device %s test %d expect dmBitsPerPel %u, got %u\n", device, test, expected.dmBitsPerPel, dm.dmBitsPerPel); ok_(__FILE__, line)(!(expected.dmFields & DM_PELSWIDTH) || dm.dmPelsWidth == expected.dmPelsWidth, diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 0fa5bcf6294..a1b61e9c165 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -45,6 +45,16 @@ struct x11drv_display_setting DEVMODEW desired_mode; }; +struct x11drv_display_depth +{ + struct list entry; + ULONG_PTR display_id; + DWORD depth; +}; + +/* Display device emulated depth list, protected by modes_section */ +static struct list x11drv_display_depth_list = LIST_INIT(x11drv_display_depth_list); + /* All Windows drivers seen so far either support 32 bit depths, or 24 bit depths, but never both. So if we have * a 32 bit framebuffer, report 32 bit bpps, otherwise 24 bit ones. */ @@ -405,6 +415,54 @@ static int mode_compare(const void *p1, const void *p2) return a->u1.s2.dmDisplayOrientation - b->u1.s2.dmDisplayOrientation; } +static void set_display_depth(ULONG_PTR display_id, DWORD depth) +{ + struct x11drv_display_depth *display_depth; + + EnterCriticalSection(&modes_section); + LIST_FOR_EACH_ENTRY(display_depth, &x11drv_display_depth_list, struct x11drv_display_depth, entry) + { + if (display_depth->display_id == display_id) + { + display_depth->depth = depth; + LeaveCriticalSection(&modes_section); + return; + } + } + + display_depth = heap_alloc(sizeof(*display_depth)); + if (!display_depth) + { + ERR("Failed to allocate memory.\n"); + LeaveCriticalSection(&modes_section); + return; + } + + display_depth->display_id = display_id; + display_depth->depth = depth; + list_add_head(&x11drv_display_depth_list, &display_depth->entry); + LeaveCriticalSection(&modes_section); +} + +static DWORD get_display_depth(ULONG_PTR display_id) +{ + struct x11drv_display_depth *display_depth; + DWORD depth; + + EnterCriticalSection(&modes_section); + LIST_FOR_EACH_ENTRY(display_depth, &x11drv_display_depth_list, struct x11drv_display_depth, entry) + { + if (display_depth->display_id == display_id) + { + depth = display_depth->depth; + LeaveCriticalSection(&modes_section); + return depth; + } + } + LeaveCriticalSection(&modes_section); + return screen_bpp; +} + /*********************************************************************** * EnumDisplaySettingsEx (X11DRV.@) * @@ -434,6 +492,10 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo ERR("Failed to get %s current display settings.\n", wine_dbgstr_w(name)); return FALSE; } + + if (!is_detached_mode(devmode)) + devmode->dmBitsPerPel = get_display_depth(id); + goto done; } @@ -842,6 +904,8 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT full_mode->u1.s2.dmDisplayOrientation); ret = handler.set_current_mode(displays[display_idx].id, full_mode); + if (attached_mode && ret == DISP_CHANGE_SUCCESSFUL) + set_display_depth(displays[display_idx].id, full_mode->dmBitsPerPel); free_full_mode(full_mode); if (ret != DISP_CHANGE_SUCCESSFUL) return ret; -- 2.25.1

1 0

[PATCH] combase/tests: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/combase/tests/roapi.c | 8 +++----- dlls/combase/tests/string.c | 17 ++++++++--------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index eef00fcc8ba..6180ad24d68 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -60,9 +60,6 @@ static BOOL init_functions(void) static void test_ActivationFactories(void) { - static const WCHAR xmldocumentW[] = { 'W','i','n','d','o','w','s','.','D','a','t','a','.','X','m','l','.', - 'D','o','m','.','X','m','l','D','o','c','u','m','e','n','t',0 }; - static const WCHAR nonexistW[] = { 'D','o','e','s','.','N','o','t','.','E','x','i','s','t',0 }; HRESULT hr; HSTRING str, str2; IActivationFactory *factory = NULL; @@ -74,10 +71,11 @@ static void test_ActivationFactories(void) return; } - hr = pWindowsCreateString(xmldocumentW, ARRAY_SIZE(xmldocumentW) - 1, &str); + hr = pWindowsCreateString(L"Windows.Data.Xml.Dom.XmlDocument", + ARRAY_SIZE(L"Windows.Data.Xml.Dom.XmlDocument") - 1, &str); ok(hr == S_OK, "got %08x\n", hr); - hr = pWindowsCreateString(nonexistW, ARRAY_SIZE(nonexistW) - 1, &str2); + hr = pWindowsCreateString(L"Does.Not.Exist", ARRAY_SIZE(L"Does.Not.Exist") - 1, &str2); ok(hr == S_OK, "got %08x\n", hr); hr = pRoInitialize(RO_INIT_MULTITHREADED); diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 04d0f3e3a55..a84973ff56b 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -101,12 +101,11 @@ static void _check_string(int line, HSTRING str, LPCWSTR content, UINT32 length, ok_(__FILE__, line)(memcmp(ptr, content, sizeof(*content) * length) == 0, "Incorrect string content\n"); } -static const WCHAR input_string[] = { 'a', 'b', 'c', 'd', 'e', 'f', '\0', '\0' }; -static const WCHAR input_string1[] = { 'a', 'b', 'c', '\0' }; -static const WCHAR input_string2[] = { 'd', 'e', 'f', '\0' }; -static const WCHAR input_empty_string[] = { '\0' }; -static const WCHAR input_embed_null[] = { 'a', '\0', 'c', '\0', 'e', 'f', '\0' }; -static const WCHAR output_substring[] = { 'c', 'd', 'e', 'f', '\0' }; +static const WCHAR input_string[] = L"abcdef\0"; +static const WCHAR input_string1[] = L"abc"; +static const WCHAR input_string2[] = L"def"; +static const WCHAR input_embed_null[] = L"a\0c\0ef"; +static const WCHAR output_substring[] = L"cdef"; static void test_create_delete(void) { @@ -147,7 +146,7 @@ static void test_create_delete(void) ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); /* Test an empty string */ - ok(pWindowsCreateString(input_empty_string, 0, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsCreateString(L"", 0, &str) == S_OK, "Failed to create string\n"); ok(str == NULL, "Empty string not a null string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); @@ -155,7 +154,7 @@ static void test_create_delete(void) ok(str == NULL, "Empty string not a null string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); - ok(pWindowsCreateStringReference(input_empty_string, 0, &header, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsCreateStringReference(L"", 0, &header, &str) == S_OK, "Failed to create string\n"); ok(str == NULL, "Empty string not a null string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); @@ -230,7 +229,7 @@ static void test_string_buffer(void) ok(ptr != NULL, "Empty string didn't return a buffer pointer\n"); ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n"); ok(str == NULL, "Empty string isn't a null string\n"); - check_string(str, input_empty_string, 0, FALSE); + check_string(str, L"", 0, FALSE); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); ok(pWindowsDeleteStringBuffer(NULL) == S_OK, "Failed to delete null string buffer\n"); -- 2.26.2

2 1

[PATCH] combase: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/combase/roapi.c | 12 ++++-------- dlls/combase/rpc.c | 3 +-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 94b79ff3cfd..53da979d681 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -39,11 +39,6 @@ static const char *debugstr_hstring(HSTRING hstr) static HRESULT get_library_for_classid(const WCHAR *classid, WCHAR **out) { - static const WCHAR classkeyW[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','R','u','n','t','i','m','e','\\', - 'A','c','t','i','v','a','t','a','b','l','e','C','l','a','s','s','I','d',0}; - static const WCHAR dllpathW[] = {'D','l','l','P','a','t','h',0}; HKEY hkey_root, hkey_class; DWORD type, size; HRESULT hr; @@ -52,7 +47,8 @@ static HRESULT get_library_for_classid(const WCHAR *classid, WCHAR **out) *out = NULL; /* load class registry key */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, classkeyW, 0, KEY_READ, &hkey_root)) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\WindowsRuntime\\ActivatableClassId", + 0, KEY_READ, &hkey_root)) return REGDB_E_READREGDB; if (RegOpenKeyExW(hkey_root, classid, 0, KEY_READ, &hkey_class)) { @@ -63,7 +59,7 @@ static HRESULT get_library_for_classid(const WCHAR *classid, WCHAR **out) RegCloseKey(hkey_root); /* load (and expand) DllPath registry value */ - if (RegQueryValueExW(hkey_class, dllpathW, NULL, &type, NULL, &size)) + if (RegQueryValueExW(hkey_class, L"DllPath", NULL, &type, NULL, &size)) { hr = REGDB_E_READREGDB; goto done; @@ -78,7 +74,7 @@ static HRESULT get_library_for_classid(const WCHAR *classid, WCHAR **out) hr = E_OUTOFMEMORY; goto done; } - if (RegQueryValueExW(hkey_class, dllpathW, NULL, NULL, (BYTE *)buf, &size)) + if (RegQueryValueExW(hkey_class, L"DllPath", NULL, NULL, (BYTE *)buf, &size)) { hr = REGDB_E_READREGDB; goto done; diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index c4bc8983a2c..55450ad7f14 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -77,8 +77,7 @@ struct registered_if static inline void get_rpc_endpoint(LPWSTR endpoint, const OXID *oxid) { /* FIXME: should get endpoint from rpcss */ - static const WCHAR wszEndpointFormat[] = {'\\','p','i','p','e','\\','O','L','E','_','%','0','8','l','x','%','0','8','l','x',0}; - wsprintfW(endpoint, wszEndpointFormat, (DWORD)(*oxid >> 32),(DWORD)*oxid); + wsprintfW(endpoint, L"\\pipe\\OLE_%08lx%08lx", (DWORD)(*oxid >> 32), (DWORD)*oxid); } typedef struct -- 2.26.2

2 1

[PATCH v2 2/2] crypt32: Add support for CMSG_ENCODED_MESSAGE.
by Dmitry Timoshkov 05 Oct '20

05 Oct '20

v2: Propagate return value of CRYPT_CopyParam(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/msg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 0e50cc13d6..cb99cf8a91 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -3190,6 +3190,12 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_ENCODED_MESSAGE: + if (msg->msg_data.pbData) + ret = CRYPT_CopyParam(pvData, pcbData, msg->msg_data.pbData, msg->msg_data.cbData); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; case CMSG_ENCODED_SIGNER: if (msg->u.signed_data.info) { -- 2.26.2

1 0

[PATCH v2 1/2] crypt32: Add support for CMSG_SIGNER_AUTH_ATTR_PARAM.
by Dmitry Timoshkov 05 Oct '20

05 Oct '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/msg.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 5df03f7c99..0e50cc13d6 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2998,6 +2998,37 @@ static BOOL CDecodeEnvelopedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, return ret; } +static BOOL CRYPT_CopyAuthAttr(void *pvData, DWORD *pcbData, + const CMSG_CMS_SIGNER_INFO *in) +{ + DWORD size; + BOOL ret; + + TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); + + size = CRYPT_SizeOfAttributes(&in->AuthAttrs); + if (!pvData) + { + *pcbData = size; + ret = TRUE; + } + else if (*pcbData < size) + { + *pcbData = size; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + CRYPT_ATTRIBUTES *out = pvData; + + CRYPT_ConstructAttributes(out,&in->AuthAttrs); + ret = TRUE; + } + TRACE("returning %d\n", ret); + return ret; +} + static BOOL CRYPT_CopyUnauthAttr(void *pvData, DWORD *pcbData, const CMSG_CMS_SIGNER_INFO *in) { @@ -3202,6 +3233,20 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + + case CMSG_SIGNER_AUTH_ATTR_PARAM: + if (msg->u.signed_data.info) + { + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyAuthAttr(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex]); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_SIGNER_UNAUTH_ATTR_PARAM: if (msg->u.signed_data.info) { -- 2.26.2

1 0

[PATCH] winemac.drv: Add DriverDate registry property to display adapters.
by Zhiyi Zhang 05 Oct '20

05 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index f6390becea7..0194f26d08b 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -64,6 +64,7 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4ab static const char initial_mode_key[] = "Initial Display Mode"; static const WCHAR pixelencodingW[] = {'P','i','x','e','l','E','n','c','o','d','i','n','g',0}; static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; +static const WCHAR driver_dateW[] = {'D','r','i','v','e','r','D','a','t','e',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR pciW[] = {'P','C','I',0}; @@ -121,7 +122,7 @@ static const WCHAR monitor_instance_fmtW[] = { static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; - +static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; static CFArrayRef modes; static BOOL modes_has_8bpp, modes_has_16bpp; @@ -1455,6 +1456,7 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; DEVPROPTYPE property_type; + SYSTEMTIME systemtime; WCHAR nameW[MAX_PATH]; WCHAR bufferW[1024]; FILETIME filetime; @@ -1512,6 +1514,12 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int GetSystemTimeAsFileTime(&filetime); if (RegSetValueExW(hkey, driver_date_dataW, 0, REG_BINARY, (BYTE *)&filetime, sizeof(filetime))) goto done; + + GetSystemTime(&systemtime); + sprintfW(bufferW, driver_date_fmtW, systemtime.wMonth, systemtime.wDay, systemtime.wYear); + if (RegSetValueExW(hkey, driver_dateW, 0, REG_SZ, (BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); /* Retrieve driver value for adapters */ -- 2.25.1

1 0

[PATCH] tzres: Add North Korea Time Zone.
by Daniel Lehman 04 Oct '20

04 Oct '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/tzres/tzres.rc | 2 ++ loader/wine.inf.in | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/tzres/tzres.rc b/dlls/tzres/tzres.rc index 34446dc1723..4763aa63ebf 100644 --- a/dlls/tzres/tzres.rc +++ b/dlls/tzres/tzres.rc @@ -168,6 +168,8 @@ STRINGTABLE 19057 "North Asia East Daylight Time" 304 "North Asia Standard Time" 305 "North Asia Daylight Time" + 35888 "North Korea Standard Time" + 35889 "North Korea Daylight Time" 65008 "Pacific SA Standard Time" 65009 "Pacific SA Daylight Time" 11232 "Pacific Standard Time" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9fcbf47c9f0..f3ad3ce754f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3394,6 +3394,20 @@ HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"MUI_Dlt",,"@tzres.d HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"MUI_Std",,"@tzres.dll,-304" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"Std",,"North Asia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"Display",,"Asia/Pyongyang" +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"Dlt",,"North Korea Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"MUI_Dlt",,"@tzres.dll,-35889" +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"MUI_Std",,"@tzres.dll,-35888" +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"Std",,"North Korea Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2014",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2015",1,e4,fd,ff,ff,00,00,00,00,1e,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,08,00,06,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2016",1,02,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2017",1,02,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2018",1,02,fe,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,05,00,05,00,01,00,17,00,1e,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2019",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"FirstEntry",0x10001,"2014" +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"LastEntry",0x10001,"2019" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Display",,"America/Santiago" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Dlt",,"Pacific SA Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"MUI_Dlt",,"@tzres.dll,-65009" -- 2.25.1

1 0

[PATCH v2] msvfw32/tests: add a few tests for MCIWndCreate
by David Adam 04 Oct '20

04 Oct '20

Thanks for your feedback, Dmitry.

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel