July 2021 - Wine-devel - list.winehq.org

[PATCH] mfplat: Add some Video Processor attributes to tracing.
by Nikolay Sivov 16 Jul '21

16 Jul '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 4 ++++ include/mfidl.idl | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5406ceb5063..bcad90c29da 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1530,11 +1530,13 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_TIMESTAMP_CAN_BE_DTS), X(MFT_CODEC_MERIT_Attribute), X(MF_TOPOLOGY_PLAYBACK_MAX_DIMS), + X(MF_XVP_DISABLE_FRC), X(MF_LOW_LATENCY), X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), X(MF_MT_MPEG2_FLAGS), X(MF_MEDIA_ENGINE_AUDIO_CATEGORY), X(MF_MT_PIXEL_ASPECT_RATIO), + X(MF_VIDEO_PROCESSOR_ALGORITHM), X(MF_TOPOLOGY_ENABLE_XVP_FOR_PLAYBACK), X(MFT_CONNECTED_STREAM_ATTRIBUTE), X(MF_MT_REALTIME_CONTENT), @@ -1546,6 +1548,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_MAX_LUMINANCE_LEVEL), X(MFT_CONNECTED_TO_HW_STREAM), X(MF_SA_D3D_AWARE), + X(MF_XVP_SAMPLE_LOCK_TIMEOUT), X(MF_MT_MAX_KEYFRAME_SPACING), X(MFT_TRANSFORM_CLSID_Attribute), X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), @@ -1741,6 +1744,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_VIDEO_RENDERER_EXTENSION_PROFILE), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_HW_SOURCE), X(MF_MT_AUDIO_PREFER_WAVEFORMATEX), + X(MF_XVP_CALLER_ALLOCATES_OUTPUT), X(MF_MT_H264_SVC_CAPABILITIES), X(MF_TOPONODE_WORKQUEUE_ITEM_PRIORITY), X(MF_MT_SPATIAL_AUDIO_OBJECT_METADATA_LENGTH), diff --git a/include/mfidl.idl b/include/mfidl.idl index 76e0d0dfeb4..5b16c08bb90 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1573,4 +1573,9 @@ cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID, 0xba491364, 0xb cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, 0xba491365, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, 0xba491366, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_VIDEO_PROCESSOR_ALGORITHM, 0x4a0a1e1f, 0x272c, 0x4fb6, 0x9e, 0xb1, 0xdb, 0x33, 0x0c, 0xbc, 0x97, 0xca);") +cpp_quote("EXTERN_GUID(MF_XVP_DISABLE_FRC, 0x2c0afa19, 0x7a97, 0x4d5a, 0x9e, 0xe8, 0x16, 0xd4, 0xfc, 0x51, 0x8d, 0x8c);") +cpp_quote("EXTERN_GUID(MF_XVP_CALLER_ALLOCATES_OUTPUT, 0x4a2cabc, 0x0cab, 0x40b1, 0xa1, 0xb9, 0x75, 0xbc, 0x36, 0x58, 0xf0, 0x00);") +cpp_quote("EXTERN_GUID(MF_XVP_SAMPLE_LOCK_TIMEOUT, 0xaa4ddb29, 0x5134, 0x4363, 0xac, 0x72, 0x83, 0xec, 0x4b, 0xc1, 0x04, 0x26);") + cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);") -- 2.30.2

1 0

[PATCH] winegstreamer: Use consistent trace format for MF objects.
by Nikolay Sivov 16 Jul '21

16 Jul '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 54 +++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index cb7a447d66d..2d9fffad31a 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -559,7 +559,7 @@ static HRESULT WINAPI media_stream_QueryInterface(IMFMediaStream *iface, REFIID { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%s %p)\n", stream, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); if (IsEqualIID(riid, &IID_IMFMediaStream) || IsEqualIID(riid, &IID_IMFMediaEventGenerator) || @@ -583,7 +583,7 @@ static ULONG WINAPI media_stream_AddRef(IMFMediaStream *iface) struct media_stream *stream = impl_from_IMFMediaStream(iface); ULONG ref = InterlockedIncrement(&stream->ref); - TRACE("(%p) ref=%u\n", stream, ref); + TRACE("%p, refcount %u.\n", iface, ref); return ref; } @@ -591,10 +591,9 @@ static ULONG WINAPI media_stream_AddRef(IMFMediaStream *iface) static ULONG WINAPI media_stream_Release(IMFMediaStream *iface) { struct media_stream *stream = impl_from_IMFMediaStream(iface); - ULONG ref = InterlockedDecrement(&stream->ref); - TRACE("(%p) ref=%u\n", stream, ref); + TRACE("%p, refcount %u.\n", iface, ref); if (!ref) { @@ -610,7 +609,7 @@ static HRESULT WINAPI media_stream_GetEvent(IMFMediaStream *iface, DWORD flags, { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%#x, %p)\n", stream, flags, event); + TRACE("%p, %#x, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); } @@ -619,7 +618,7 @@ static HRESULT WINAPI media_stream_BeginGetEvent(IMFMediaStream *iface, IMFAsync { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%p, %p)\n", stream, callback, state); + TRACE("%p, %p, %p.\n", iface, callback, state); return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state); } @@ -628,7 +627,7 @@ static HRESULT WINAPI media_stream_EndGetEvent(IMFMediaStream *iface, IMFAsyncRe { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%p, %p)\n", stream, result, event); + TRACE("%p, %p, %p.\n", stream, result, event); return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event); } @@ -638,7 +637,7 @@ static HRESULT WINAPI media_stream_QueueEvent(IMFMediaStream *iface, MediaEventT { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%d, %s, %#x, %p)\n", stream, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); } @@ -647,7 +646,7 @@ static HRESULT WINAPI media_stream_GetMediaSource(IMFMediaStream *iface, IMFMedi { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%p)\n", stream, source); + TRACE("%p, %p.\n", iface, source); if (stream->state == STREAM_SHUTDOWN) return MF_E_SHUTDOWN; @@ -662,7 +661,7 @@ static HRESULT WINAPI media_stream_GetStreamDescriptor(IMFMediaStream* iface, IM { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%p)\n", stream, descriptor); + TRACE("%p, %p.\n", iface, descriptor); if (stream->state == STREAM_SHUTDOWN) return MF_E_SHUTDOWN; @@ -679,7 +678,7 @@ static HRESULT WINAPI media_stream_RequestSample(IMFMediaStream *iface, IUnknown struct source_async_command *command; HRESULT hr; - TRACE("(%p)->(%p)\n", iface, token); + TRACE("%p, %p.\n", iface, token); if (stream->state == STREAM_SHUTDOWN) return MF_E_SHUTDOWN; @@ -745,7 +744,8 @@ static HRESULT new_media_stream(struct media_source *source, if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto fail; - TRACE("->(%p)\n", object); + TRACE("Created stream object %p.\n", object); + *out_stream = object; return S_OK; @@ -1031,7 +1031,7 @@ static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%s %p)\n", source, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); if (IsEqualIID(riid, &IID_IMFMediaSource) || IsEqualIID(riid, &IID_IMFMediaEventGenerator) || @@ -1045,7 +1045,7 @@ static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID } else { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); + FIXME("%s, %p.\n", debugstr_guid(riid), out); *out = NULL; return E_NOINTERFACE; } @@ -1059,7 +1059,7 @@ static ULONG WINAPI media_source_AddRef(IMFMediaSource *iface) struct media_source *source = impl_from_IMFMediaSource(iface); ULONG ref = InterlockedIncrement(&source->ref); - TRACE("(%p) ref=%u\n", source, ref); + TRACE("%p, refcount %u.\n", iface, ref); return ref; } @@ -1069,7 +1069,7 @@ static ULONG WINAPI media_source_Release(IMFMediaSource *iface) struct media_source *source = impl_from_IMFMediaSource(iface); ULONG ref = InterlockedDecrement(&source->ref); - TRACE("(%p) ref=%u\n", source, ref); + TRACE("%p, refcount %u.\n", iface, ref); if (!ref) { @@ -1085,7 +1085,7 @@ static HRESULT WINAPI media_source_GetEvent(IMFMediaSource *iface, DWORD flags, { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%#x, %p)\n", source, flags, event); + TRACE("%p, %#x, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(source->event_queue, flags, event); } @@ -1094,7 +1094,7 @@ static HRESULT WINAPI media_source_BeginGetEvent(IMFMediaSource *iface, IMFAsync { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%p, %p)\n", source, callback, state); + TRACE("%p, %p, %p.\n", iface, callback, state); return IMFMediaEventQueue_BeginGetEvent(source->event_queue, callback, state); } @@ -1103,7 +1103,7 @@ static HRESULT WINAPI media_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncRe { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%p, %p)\n", source, result, event); + TRACE("%p, %p, %p.\n", iface, result, event); return IMFMediaEventQueue_EndGetEvent(source->event_queue, result, event); } @@ -1113,7 +1113,7 @@ static HRESULT WINAPI media_source_QueueEvent(IMFMediaSource *iface, MediaEventT { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%d, %s, %#x, %p)\n", source, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, ext_type, hr, value); } @@ -1122,7 +1122,7 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%p)\n", source, characteristics); + TRACE("%p, %p.\n", iface, characteristics); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1136,7 +1136,7 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource * { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%p)\n", source, descriptor); + TRACE("%p, %p.\n", iface, descriptor); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1151,7 +1151,7 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD struct source_async_command *command; HRESULT hr; - TRACE("(%p)->(%p, %p, %p)\n", source, descriptor, time_format, position); + TRACE("%p, %p, %p, %p.\n", iface, descriptor, time_format, position); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1177,7 +1177,7 @@ static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) struct source_async_command *command; HRESULT hr; - TRACE("(%p)\n", source); + TRACE("%p.\n", iface); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1192,7 +1192,7 @@ static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) { struct media_source *source = impl_from_IMFMediaSource(iface); - FIXME("(%p): stub\n", source); + FIXME("%p: stub\n", iface); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1205,7 +1205,7 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) struct media_source *source = impl_from_IMFMediaSource(iface); unsigned int i; - TRACE("(%p)\n", source); + TRACE("%p.\n", iface); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1731,7 +1731,7 @@ static HRESULT WINAPI winegstreamer_stream_handler_callback_GetParameters(IMFAsy static HRESULT winegstreamer_stream_handler_create_object(struct winegstreamer_stream_handler *This, WCHAR *url, IMFByteStream *stream, DWORD flags, IPropertyStore *props, IUnknown **out_object, MF_OBJECT_TYPE *out_obj_type) { - TRACE("(%p %s %p %u %p %p %p)\n", This, debugstr_w(url), stream, flags, props, out_object, out_obj_type); + TRACE("%p, %s, %p, %u, %p, %p, %p.\n", This, debugstr_w(url), stream, flags, props, out_object, out_obj_type); if (flags & MF_RESOLUTION_MEDIASOURCE) { -- 2.30.2

1 0

[PATCH] user32/tests: Fix the keyboard layout id in an ok() message.
by Francois Gouget 16 Jul '21

16 Jul '21

The keyboard layout being tested is not the thread's default keyboard layout. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- See also https://bugs.winehq.org/show_bug.cgi?id=51478 dlls/user32/tests/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 654cabb76d9..08323c4f40e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3166,7 +3166,7 @@ static void test_keyboard_layout_name(void) swprintf( tmpklid, KL_NAMELENGTH, L"%08X", layouts_preload[j] ); if (!wcscmp( tmpklid, klid )) break; } - ok(j < len, "Could not find keyboard layout %p in preload list\n", layout); + ok(j < len, "Could not find keyboard layout %s in preload list\n", wine_dbgstr_w(klid)); if (id & 0x80000000) { -- 2.20.1

2 1

[PATCH 1/3] oleaut32/tests: Use EQ_DOUBLE() in vartype too.
by Francois Gouget 16 Jul '21

16 Jul '21

This simplifies the code and fixes support for negative values. Also trim unnecessary spaces from the EXPECT_DBL() failure messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartype.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index c69db6cba17..aa57fb44142 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -50,6 +50,11 @@ DEFINE_GUID(UUID_test_struct, 0x4029f190, 0xca4a, 0x4611, 0xae,0xb9,0x67,0x39,0x # endif #endif +/* When comparing floating point values we cannot expect an exact match + * because the rounding errors depend on the exact algorithm. + */ +#define EQ_DOUBLE(a,b) (fabs((a)-(b)) / (1.0+fabs(a)+fabs(b)) < 1e-14) + static HMODULE hOleaut32; /* Has I8/UI8 data type? */ @@ -77,7 +82,7 @@ static BOOL has_locales; ok(hres == S_OK && out == (CONV_TYPE)(x), "expected " #x ", got " fs "; hres=0x%08x\n", out, hres) #define EXPECT(x) EXPECTRES(S_OK, (x)) #define EXPECT_DBL(x) \ - ok(hres == S_OK && fabs(out-(x))<=1e-14*(x), "expected %16.16g, got %16.16g; hres=0x%08x\n", (x), out, hres) + ok(hres == S_OK && EQ_DOUBLE(out, (x)), "expected %.16g, got %.16g; hres=0x%08x\n", (x), out, hres) #define CONVERT(func, val) in = val; hres = func(in, &out) #define CONVERTRANGE(func,start,end) for (i = start; i < end; i+=1) { CONVERT(func, i); EXPECT(i); }; -- 2.20.1

2 3

[PATCH 1/2] oleaut32/tests: Allow testing VarParseNumFromStr() using Unicode strings.
by Francois Gouget 16 Jul '21

16 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 9a9ded10406..9fdd86956d8 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1262,21 +1262,27 @@ static void test_VariantCopyInd(void) "CopyInd(ref->ref): expected E_INVALIDARG, got 0x%08x\n", hres); } -static HRESULT (WINAPI *pVarParseNumFromStr)(OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); +static HRESULT (WINAPI *pVarParseNumFromStr)(const OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); /* Macros for converting and testing the result of VarParseNumFromStr */ #define FAILDIG 255 -static HRESULT convert_str( const char *str, INT dig, ULONG flags, +static HRESULT wconvert_str( const OLECHAR *str, INT dig, ULONG flags, NUMPARSE *np, BYTE rgb[128], LCID lcid ) { - OLECHAR buff[128]; - MultiByteToWideChar( CP_ACP,0, str, -1, buff, ARRAY_SIZE( buff )); memset( rgb, FAILDIG, 128 ); memset( np, 255, sizeof(*np) ); np->cDig = dig; np->dwInFlags = flags; - return pVarParseNumFromStr( buff, lcid, LOCALE_NOUSEROVERRIDE, np, rgb); + return pVarParseNumFromStr( str, lcid, LOCALE_NOUSEROVERRIDE, np, rgb); +} + +static HRESULT convert_str( const char *str, INT dig, ULONG flags, + NUMPARSE *np, BYTE rgb[128], LCID lcid ) +{ + OLECHAR buff[128]; + MultiByteToWideChar( CP_ACP,0, str, -1, buff, ARRAY_SIZE( buff )); + return wconvert_str(buff, dig, flags, np, rgb, lcid); } static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULONG b, ULONG c, @@ -1293,6 +1299,8 @@ static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULON } } +#define WCONVERTN(str,dig,flags) hres = wconvert_str( str, dig, flags, &np, rgb, lcid ) +#define WCONVERT(str,flags) WCONVERTN(str,sizeof(rgb),flags) #define CONVERTN(str,dig,flags) hres = convert_str( str, dig, flags, &np, rgb, lcid ) #define CONVERT(str,flags) CONVERTN(str,sizeof(rgb),flags) #define EXPECT(a,b,c,d,e,f) expect_NumFromStr( __LINE__, hres, &np, a, b, c, d, e, f ) @@ -1307,7 +1315,6 @@ static void test_VarParseNumFromStr(void) LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); NUMPARSE np; BYTE rgb[128]; - WCHAR str[128]; /** No flags **/ @@ -1731,10 +1738,9 @@ static void test_VarParseNumFromStr(void) EXPECT(1,NUMPRS_STD,NUMPRS_DECIMAL,4,0,-1); EXPECT2(1,0); - str[0] = 0x0660; - str[1] = 0; - hres = pVarParseNumFromStr(str, lcid, LOCALE_NOUSEROVERRIDE, &np, rgb); - ok(hres == DISP_E_TYPEMISMATCH, "VarParseNumFromStr returned %08x\n", hres); + /* Arabic numerals are not allowed "0" */ + WCONVERT(L"\x660", NUMPRS_STD); + EXPECTFAIL; } static HRESULT (WINAPI *pVarNumFromParseNum)(NUMPARSE*,BYTE*,ULONG,VARIANT*); -- 2.20.1

1 1

[PATCH] oleaut32: Fix the Var*FromStr() prototypes.
by Francois Gouget 16 Jul '21

16 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The only non-totally-trivial change is the VarDateFromStr() implementation. --- dlls/oleaut32/variant.c | 2 +- dlls/oleaut32/vartype.c | 35 ++++++++++++++++++----------------- include/oleauto.h | 30 +++++++++++++++--------------- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b3a568c355c..fdc402c7a62 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1607,7 +1607,7 @@ static inline BOOL is_digit(WCHAR c) * - I am unsure if this function should parse non-Arabic (e.g. Thai) * numerals, so this has not been implemented. */ -HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, +HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, NUMPARSE *pNumprs, BYTE *rgbDig) { VARIANT_NUMBER_CHARS chars; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 4e3c4419567..5eacd43c5ae 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -84,7 +84,7 @@ static inline void VARIANT_CopyData(const VARIANT *srcVar, VARTYPE vt, void *pOu /* Coerce VT_BSTR to a numeric type */ -static HRESULT VARIANT_NumberFromBstr(OLECHAR* pStrIn, LCID lcid, ULONG ulFlags, +static HRESULT VARIANT_NumberFromBstr(const OLECHAR* pStrIn, LCID lcid, ULONG ulFlags, void* pOut, VARTYPE vt) { VARIANTARG dstVar; @@ -421,7 +421,7 @@ HRESULT WINAPI VarI1FromCy(CY cyIn, signed char* pcOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, signed char* pcOut) +HRESULT WINAPI VarI1FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, signed char* pcOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pcOut, VT_I1); } @@ -714,7 +714,7 @@ HRESULT WINAPI VarUI1FromDate(DATE dateIn, BYTE* pbOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarUI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut) +HRESULT WINAPI VarUI1FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pbOut, VT_UI1); } @@ -1015,7 +1015,7 @@ HRESULT WINAPI VarI2FromDate(DATE dateIn, SHORT* psOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, SHORT* psOut) +HRESULT WINAPI VarI2FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, SHORT* psOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, psOut, VT_I2); } @@ -1329,7 +1329,7 @@ HRESULT WINAPI VarUI2FromCy(CY cyIn, USHORT* pusOut) * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarUI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, USHORT* pusOut) +HRESULT WINAPI VarUI2FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, USHORT* pusOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pusOut, VT_UI2); } @@ -1605,7 +1605,7 @@ HRESULT WINAPI VarI4FromDate(DATE dateIn, LONG *piOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if strIn cannot be converted */ -HRESULT WINAPI VarI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG *piOut) +HRESULT WINAPI VarI4FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG *piOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, piOut, VT_I4); } @@ -1914,7 +1914,7 @@ HRESULT WINAPI VarUI4FromCy(CY cyIn, ULONG *pulOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if strIn cannot be converted */ -HRESULT WINAPI VarUI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, ULONG *pulOut) +HRESULT WINAPI VarUI4FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, ULONG *pulOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pulOut, VT_UI4); } @@ -2221,7 +2221,7 @@ HRESULT WINAPI VarI8FromDate(DATE dateIn, LONG64* pi64Out) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarI8FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG64* pi64Out) +HRESULT WINAPI VarI8FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG64* pi64Out) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pi64Out, VT_I8); } @@ -2549,7 +2549,7 @@ HRESULT WINAPI VarUI8FromDate(DATE dateIn, ULONG64* pui64Out) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarUI8FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, ULONG64* pui64Out) +HRESULT WINAPI VarUI8FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, ULONG64* pui64Out) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pui64Out, VT_UI8); } @@ -2824,7 +2824,7 @@ HRESULT WINAPI VarR4FromDate(DATE dateIn, float *pFltOut) * Failure: E_INVALIDARG, if strIn or pFltOut is invalid. * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarR4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, float *pFltOut) +HRESULT WINAPI VarR4FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, float *pFltOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pFltOut, VT_R4); } @@ -3145,7 +3145,7 @@ HRESULT WINAPI VarR8FromDate(DATE dateIn, double *pDblOut) * Failure: E_INVALIDARG, if strIn or pDblOut is invalid. * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarR8FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, double *pDblOut) +HRESULT WINAPI VarR8FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, double *pDblOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pDblOut, VT_R8); } @@ -3569,7 +3569,7 @@ HRESULT WINAPI VarCyFromDate(DATE dateIn, CY* pCyOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarCyFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, CY* pCyOut) +HRESULT WINAPI VarCyFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, CY* pCyOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pCyOut, VT_CY); } @@ -4267,7 +4267,7 @@ HRESULT WINAPI VarDecFromCy(CY cyIn, DECIMAL* pDecOut) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarDecFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DECIMAL* pDecOut) +HRESULT WINAPI VarDecFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, DECIMAL* pDecOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pDecOut, VT_DECIMAL); } @@ -6108,7 +6108,7 @@ static BOOL VARIANT_GetLocalisedText(LANGID langId, DWORD dwId, WCHAR *lpszDest) * - If the text is not numeric and does not match any of the above, then * DISP_E_TYPEMISMATCH is returned. */ -HRESULT WINAPI VarBoolFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL *pBoolOut) +HRESULT WINAPI VarBoolFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL *pBoolOut) { WCHAR szBuff[64]; LANGID langId = MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT); @@ -7595,7 +7595,7 @@ VARIANT_MakeDate_OK: * the date is invalid in that format, in which the most compatible format * that produces a valid date will be used. */ -HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pdateOut) +HRESULT WINAPI VarDateFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pdateOut) { static const USHORT ParseDateTokens[] = { @@ -7664,14 +7664,15 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd { if ('0' <= *strIn && *strIn <= '9') { + OLECHAR* end; if (dp.dwCount >= 6) { hRet = DISP_E_TYPEMISMATCH; break; } - dp.dwValues[dp.dwCount] = wcstoul(strIn, &strIn, 10); + dp.dwValues[dp.dwCount] = wcstoul(strIn, &end, 10); dp.dwCount++; - strIn--; + strIn = end - 1; } else if (iswalpha(*strIn)) { diff --git a/include/oleauto.h b/include/oleauto.h index f00bfa0c7f8..1d15efd26f3 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -237,7 +237,7 @@ HRESULT WINAPI VarUI1FromI1(signed char,BYTE*); HRESULT WINAPI VarUI1FromUI2(USHORT,BYTE*); HRESULT WINAPI VarUI1FromUI4(ULONG,BYTE*); HRESULT WINAPI VarUI1FromUI8(ULONG64,BYTE*); -HRESULT WINAPI VarUI1FromStr(OLECHAR*,LCID,ULONG,BYTE*); +HRESULT WINAPI VarUI1FromStr(const OLECHAR*,LCID,ULONG,BYTE*); HRESULT WINAPI VarUI1FromCy(CY,BYTE*); HRESULT WINAPI VarUI1FromDec(const DECIMAL*,BYTE*); HRESULT WINAPI VarUI1FromDisp(IDispatch*,LCID,BYTE*); @@ -253,7 +253,7 @@ HRESULT WINAPI VarI2FromI1(signed char,SHORT*); HRESULT WINAPI VarI2FromUI2(USHORT,SHORT*); HRESULT WINAPI VarI2FromUI4(ULONG,SHORT*); HRESULT WINAPI VarI2FromUI8(ULONG64,SHORT*); -HRESULT WINAPI VarI2FromStr(OLECHAR*,LCID,ULONG,SHORT*); +HRESULT WINAPI VarI2FromStr(const OLECHAR*,LCID,ULONG,SHORT*); HRESULT WINAPI VarI2FromCy(CY,SHORT*); HRESULT WINAPI VarI2FromDec(const DECIMAL*,SHORT*); HRESULT WINAPI VarI2FromDisp(IDispatch*,LCID,SHORT*); @@ -269,7 +269,7 @@ HRESULT WINAPI VarI4FromI1(signed char,LONG*); HRESULT WINAPI VarI4FromUI2(USHORT,LONG*); HRESULT WINAPI VarI4FromUI4(ULONG,LONG*); HRESULT WINAPI VarI4FromUI8(ULONG64,LONG*); -HRESULT WINAPI VarI4FromStr(OLECHAR*,LCID,ULONG,LONG*); +HRESULT WINAPI VarI4FromStr(const OLECHAR*,LCID,ULONG,LONG*); HRESULT WINAPI VarI4FromCy(CY,LONG*); HRESULT WINAPI VarI4FromDec(const DECIMAL*,LONG*); HRESULT WINAPI VarI4FromDisp(IDispatch*,LCID,LONG*); @@ -280,7 +280,7 @@ HRESULT WINAPI VarI8FromI4(LONG,LONG64*); HRESULT WINAPI VarI8FromR4(FLOAT,LONG64*); HRESULT WINAPI VarI8FromR8(DOUBLE,LONG64*); HRESULT WINAPI VarI8FromDate(DATE,LONG64*); -HRESULT WINAPI VarI8FromStr(OLECHAR*,LCID,ULONG,LONG64*); +HRESULT WINAPI VarI8FromStr(const OLECHAR*,LCID,ULONG,LONG64*); HRESULT WINAPI VarI8FromBool(VARIANT_BOOL,LONG64*); HRESULT WINAPI VarI8FromI1(signed char,LONG64*); HRESULT WINAPI VarI8FromUI2(USHORT,LONG64*); @@ -302,7 +302,7 @@ HRESULT WINAPI VarR4FromI1(signed char,FLOAT*); HRESULT WINAPI VarR4FromUI2(USHORT,FLOAT*); HRESULT WINAPI VarR4FromUI4(ULONG,FLOAT*); HRESULT WINAPI VarR4FromUI8(ULONG64,FLOAT*); -HRESULT WINAPI VarR4FromStr(OLECHAR*,LCID,ULONG,FLOAT*); +HRESULT WINAPI VarR4FromStr(const OLECHAR*,LCID,ULONG,FLOAT*); HRESULT WINAPI VarR4FromCy(CY,FLOAT*); HRESULT WINAPI VarR4FromDec(const DECIMAL*,FLOAT*); HRESULT WINAPI VarR4FromDisp(IDispatch*,LCID,FLOAT*); @@ -318,7 +318,7 @@ HRESULT WINAPI VarR8FromI1(signed char,double*); HRESULT WINAPI VarR8FromUI2(USHORT,double*); HRESULT WINAPI VarR8FromUI4(ULONG,double*); HRESULT WINAPI VarR8FromUI8(ULONG64,double*); -HRESULT WINAPI VarR8FromStr(OLECHAR*,LCID,ULONG,double*); +HRESULT WINAPI VarR8FromStr(const OLECHAR*,LCID,ULONG,double*); HRESULT WINAPI VarR8FromCy(CY,double*); HRESULT WINAPI VarR8FromDec(const DECIMAL*,double*); HRESULT WINAPI VarR8FromDisp(IDispatch*,LCID,double*); @@ -329,7 +329,7 @@ HRESULT WINAPI VarDateFromI4(LONG,DATE*); HRESULT WINAPI VarDateFromI8(LONG64,DATE*); HRESULT WINAPI VarDateFromR4(FLOAT,DATE*); HRESULT WINAPI VarDateFromR8(DOUBLE,DATE*); -HRESULT WINAPI VarDateFromStr(OLECHAR*,LCID,ULONG,DATE*); +HRESULT WINAPI VarDateFromStr(const OLECHAR*,LCID,ULONG,DATE*); HRESULT WINAPI VarDateFromI1(signed char,DATE*); HRESULT WINAPI VarDateFromUI2(USHORT,DATE*); HRESULT WINAPI VarDateFromUI4(ULONG,DATE*); @@ -346,7 +346,7 @@ HRESULT WINAPI VarCyFromI8(LONG64,CY*); HRESULT WINAPI VarCyFromR4(FLOAT,CY*); HRESULT WINAPI VarCyFromR8(DOUBLE,CY*); HRESULT WINAPI VarCyFromDate(DATE,CY*); -HRESULT WINAPI VarCyFromStr(OLECHAR*,LCID,ULONG,CY*); +HRESULT WINAPI VarCyFromStr(const OLECHAR*,LCID,ULONG,CY*); HRESULT WINAPI VarCyFromBool(VARIANT_BOOL,CY*); HRESULT WINAPI VarCyFromI1(signed char,CY*); HRESULT WINAPI VarCyFromUI2(USHORT,CY*); @@ -378,7 +378,7 @@ HRESULT WINAPI VarBoolFromI8(LONG64,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromR4(FLOAT,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromR8(DOUBLE,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromDate(DATE,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromStr(OLECHAR*,LCID,ULONG,VARIANT_BOOL*); +HRESULT WINAPI VarBoolFromStr(const OLECHAR*,LCID,ULONG,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromI1(signed char,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromUI2(USHORT,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromUI4(ULONG,VARIANT_BOOL*); @@ -394,7 +394,7 @@ HRESULT WINAPI VarI1FromI8(LONG64,signed char*); HRESULT WINAPI VarI1FromR4(FLOAT,signed char*); HRESULT WINAPI VarI1FromR8(DOUBLE,signed char*); HRESULT WINAPI VarI1FromDate(DATE,signed char*); -HRESULT WINAPI VarI1FromStr(OLECHAR*,LCID,ULONG,signed char*); +HRESULT WINAPI VarI1FromStr(const OLECHAR*,LCID,ULONG,signed char*); HRESULT WINAPI VarI1FromBool(VARIANT_BOOL,signed char*); HRESULT WINAPI VarI1FromUI2(USHORT,signed char*); HRESULT WINAPI VarI1FromUI4(ULONG,signed char*); @@ -410,7 +410,7 @@ HRESULT WINAPI VarUI2FromI8(LONG64,USHORT*); HRESULT WINAPI VarUI2FromR4(FLOAT,USHORT*); HRESULT WINAPI VarUI2FromR8(DOUBLE,USHORT*); HRESULT WINAPI VarUI2FromDate(DATE,USHORT*); -HRESULT WINAPI VarUI2FromStr(OLECHAR*,LCID,ULONG,USHORT*); +HRESULT WINAPI VarUI2FromStr(const OLECHAR*,LCID,ULONG,USHORT*); HRESULT WINAPI VarUI2FromBool(VARIANT_BOOL,USHORT*); HRESULT WINAPI VarUI2FromI1(signed char,USHORT*); HRESULT WINAPI VarUI2FromUI4(ULONG,USHORT*); @@ -419,7 +419,7 @@ HRESULT WINAPI VarUI2FromCy(CY,USHORT*); HRESULT WINAPI VarUI2FromDec(const DECIMAL*,USHORT*); HRESULT WINAPI VarUI2FromDisp(IDispatch*,LCID,USHORT*); -HRESULT WINAPI VarUI4FromStr(OLECHAR*,LCID,ULONG,ULONG*); +HRESULT WINAPI VarUI4FromStr(const OLECHAR*,LCID,ULONG,ULONG*); HRESULT WINAPI VarUI4FromUI1(BYTE,ULONG*); HRESULT WINAPI VarUI4FromI2(SHORT,ULONG*); HRESULT WINAPI VarUI4FromI4(LONG,ULONG*); @@ -442,7 +442,7 @@ HRESULT WINAPI VarUI8FromI8(LONG64,ULONG64*); HRESULT WINAPI VarUI8FromR4(FLOAT,ULONG64*); HRESULT WINAPI VarUI8FromR8(DOUBLE,ULONG64*); HRESULT WINAPI VarUI8FromDate(DATE,ULONG64*); -HRESULT WINAPI VarUI8FromStr(OLECHAR*,LCID,ULONG,ULONG64*); +HRESULT WINAPI VarUI8FromStr(const OLECHAR*,LCID,ULONG,ULONG64*); HRESULT WINAPI VarUI8FromBool(VARIANT_BOOL,ULONG64*); HRESULT WINAPI VarUI8FromI1(signed char,ULONG64*); HRESULT WINAPI VarUI8FromUI2(USHORT,ULONG64*); @@ -459,7 +459,7 @@ HRESULT WINAPI VarDecFromI8(LONG64,DECIMAL*); HRESULT WINAPI VarDecFromR4(FLOAT,DECIMAL*); HRESULT WINAPI VarDecFromR8(DOUBLE,DECIMAL*); HRESULT WINAPI VarDecFromDate(DATE,DECIMAL*); -HRESULT WINAPI VarDecFromStr(OLECHAR*,LCID,ULONG,DECIMAL*); +HRESULT WINAPI VarDecFromStr(const OLECHAR*,LCID,ULONG,DECIMAL*); HRESULT WINAPI VarDecFromBool(VARIANT_BOOL,DECIMAL*); HRESULT WINAPI VarDecFromI1(signed char,DECIMAL*); HRESULT WINAPI VarDecFromUI2(USHORT,DECIMAL*); @@ -647,7 +647,7 @@ typedef struct #define VTBIT_CY (1 << VT_CY) #define VTBIT_DECIMAL (1 << VT_DECIMAL) -HRESULT WINAPI VarParseNumFromStr(OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); +HRESULT WINAPI VarParseNumFromStr(const OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); HRESULT WINAPI VarNumFromParseNum(NUMPARSE*,BYTE*,ULONG,VARIANT*); INT WINAPI DosDateTimeToVariantTime(USHORT,USHORT,double*); -- 2.20.1

1 0

[PATCH 2/2] include: Declare NTSTATUS in propvarutils.h
by Jacek Caban 16 Jul '21

16 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/propvarutil.h | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 1/2] include: Fix C++ InitPropVariantFromGUIDAsBuffer implementation.
by Jacek Caban 16 Jul '21

16 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/propvarutil.h | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[PATCH vkd3d 1/3] tests: Add tests for a UAV counter in a graphics pipeline.
by Conor McCarthy 16 Jul '21

16 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3892c1db..ab13f397 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21984,6 +21984,139 @@ static void test_decrement_uav_counter(void) destroy_test_context(&context); } +static void test_graphics_uav_counters(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_DESCRIPTOR_RANGE descriptor_ranges[1]; + D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; + ID3D12DescriptorHeap *cpu_heap, *gpu_heap; + ID3D12GraphicsCommandList *command_list; + ID3D12Resource *buffer, *counter_buffer; + D3D12_ROOT_PARAMETER root_parameters[1]; + struct test_context_desc desc; + struct test_context context; + struct resource_readback rb; + ID3D12CommandQueue *queue; + ID3D12Device *device; + uint32_t counter; + D3D12_BOX box; + HRESULT hr; + + static const uint32_t clear_value[4] = {0}; + static const DWORD ps_code[] = + { +#if 0 + RWStructuredBuffer<uint> u; + + void main() + { + uint i = u.IncrementCounter(); + ++u[i]; + } +#endif + 0x43425844, 0x951850a3, 0xb2e7dcee, 0x6195cf5f, 0x3e1e6220, 0x00000001, 0x000000fc, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000a8, 0x00000050, 0x0000002a, 0x0100086a, + 0x0480009e, 0x0011e000, 0x00000000, 0x00000004, 0x02000068, 0x00000001, 0x050000b2, 0x00100012, + 0x00000000, 0x0011e000, 0x00000000, 0x8b0000a7, 0x80002302, 0x00199983, 0x00100022, 0x00000000, + 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0011e006, 0x00000000, 0x0700001e, 0x00100022, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x090000a8, 0x0011e012, 0x00000000, + 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0010001a, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = 64; + desc.rt_height = 1; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; + descriptor_ranges[0].NumDescriptors = 1; + descriptor_ranges[0].BaseShaderRegister = 0; + descriptor_ranges[0].RegisterSpace = 0; + descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + root_signature_desc.NumParameters = 1; + root_signature_desc.pParameters = root_parameters; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + + cpu_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + gpu_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + + buffer = create_default_buffer(device, 64 * sizeof(uint32_t), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + counter_buffer = create_default_buffer(device, D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT + sizeof(uint32_t), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + + context.pipeline_state = create_pipeline_state(context.device, context.root_signature, 0, NULL, &ps, NULL); + + memset(&uav_desc, 0, sizeof(uav_desc)); + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.NumElements = 64; + uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); + uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; + ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, + get_cpu_descriptor_handle(&context, cpu_heap, 0)); + uav_desc.Buffer.CounterOffsetInBytes = D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT; + ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, + get_cpu_descriptor_handle(&context, gpu_heap, 0)); + + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap); + + ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list, + get_gpu_descriptor_handle(&context, gpu_heap, 0), + get_cpu_descriptor_handle(&context, cpu_heap, 0), + buffer, clear_value, 0, NULL); + uav_barrier(command_list, buffer); + + counter = 0; + upload_buffer_data(counter_buffer, uav_desc.Buffer.CounterOffsetInBytes, + sizeof(counter), &counter, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, counter_buffer, 0, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(gpu_heap)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + counter = read_uav_counter(&context, counter_buffer, uav_desc.Buffer.CounterOffsetInBytes); + todo + ok(counter == 64, "Got %u, expected 64.\n", counter); + + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + set_box(&box, 0, 0, 0, uav_desc.Buffer.NumElements, 1, 1); + todo + check_readback_data_uint(&rb, &box, 1, 0); + release_resource_readback(&rb); + + ID3D12Resource_Release(buffer); + ID3D12Resource_Release(counter_buffer); + ID3D12DescriptorHeap_Release(cpu_heap); + ID3D12DescriptorHeap_Release(gpu_heap); + destroy_test_context(&context); +} + static void test_atomic_instructions(void) { ID3D12Resource *ps_buffer, *cs_buffer, *cs_buffer2; @@ -34249,6 +34382,7 @@ START_TEST(d3d12) run_test(test_cs_uav_store); run_test(test_uav_counters); run_test(test_decrement_uav_counter); + run_test(test_graphics_uav_counters); run_test(test_atomic_instructions); run_test(test_buffer_srv); run_test(test_create_query_heap); -- 2.31.1

3 5

[PATCH vkd3d] vkd3d: Add missing parenthesis in vkd3d_init_format_info().
by Andrey Gusev 16 Jul '21

16 Jul '21

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- libs/vkd3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 08e6af9..ec2b4b3 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -399,7 +399,7 @@ HRESULT vkd3d_init_format_info(struct d3d12_device *device) if (FAILED(hr = vkd3d_init_depth_stencil_formats(device))) return hr; - if FAILED(hr = vkd3d_init_format_compatibility_lists(device)) + if (FAILED(hr = vkd3d_init_format_compatibility_lists(device))) vkd3d_cleanup_depth_stencil_formats(device); return hr; -- 2.31.1

2 1