December 2020 - Wine-Devel - list.winehq.org

[PATCH 02/10] msvcrt: Use stdio.h definitions.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 242 ++++++++++++++++++++--------------------- dlls/msvcrt/msvcrt.h | 31 +----- include/msvcrt/stdio.h | 1 + 3 files changed, 126 insertions(+), 148 deletions(-)

Dec. 1, 2020

[PATCH 01/10] msvcrt: Use heap structures and definitions from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/heap.c | 29 +++++++++++++++-------------- dlls/msvcrt/msvcrt.h | 18 ------------------ 2 files changed, 15 insertions(+), 32 deletions(-)

Dec. 1, 2020

Re: [PATCH 1/5] include: Extend debug channel name size to 31 bytes.

by Matteo Bruni

On Tue, Dec 1, 2020 at 7:11 PM Matteo Bruni <mbruni(a)codeweavers.com> wrote: > > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > I was testing the next patch in the series and I noticed that > +d3d_synchronous didn't work at all... Of course, the alternative is to shorten the channel name to fit in 14 characters. Some grepping suggests that d3d_synchronous is the only one affected, so I guess that's preferable.

Dec. 1, 2020

Re: [PATCH v2 3/4] winegstreamer: Implement ::Process(Input/Output) for audio conversion transform.

by Derek Lesho

On 12/1/20 4:27 PM, Zebediah Figura (she/her) wrote: > >>> Note that a simpler way to set the channel mask is to use >>> gst_audio_info_to_caps() in caps_from_mf_media_type(). >> Mind if I just move this functionality to caps_from_mf_media_type? I >> remember having problems with gst_audio_info_to_caps. >> > I don't think that makes very much sense in general, no. What problems > did you have with gst_audio_info_to_caps()? I don't remember unfortunately. I'll give it another shot and report back, although I'm starting to have doubts about whether or not we want channel-mask to be set when MF_MT_CHANNEL_MASK isn't.

Dec. 1, 2020

[PATCH 2/2] jscript: Clean up date formatting strings with era.

by Jeff Smith

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/jscript/date.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 5ca23f199f3..efb97aa632e 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -441,7 +441,7 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, LOCALE_SABBREVMONTHNAME9, LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; - BOOL formatAD = TRUE; + const WCHAR *formatEra = L""; WCHAR week[64], month[64]; WCHAR buf[192]; jsstr_t *date_jsstr; @@ -466,7 +466,7 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, year = year_from_time(time); if(year<0) { - formatAD = FALSE; + formatEra = L" B.C."; year = -year+1; } @@ -480,16 +480,16 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, if(!show_offset) swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %02d:%02d:%02d %d%s", week, month, day, (int)hour_from_time(time), (int)min_from_time(time), - (int)sec_from_time(time), year, formatAD?L"":L" B.C."); + (int)sec_from_time(time), year, formatEra); else if(offset) swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %02d:%02d:%02d UTC%c%02d%02d %d%s", week, month, day, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), sign, offset/60, offset%60, - year, formatAD?L"":L" B.C."); + year, formatEra); else swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %02d:%02d:%02d UTC %d%s", week, month, day, (int)hour_from_time(time), (int)min_from_time(time), - (int)sec_from_time(time), year, formatAD?L"":L" B.C."); + (int)sec_from_time(time), year, formatEra); date_jsstr = jsstr_alloc(buf); if(!date_jsstr) @@ -638,7 +638,7 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva LOCALE_SABBREVMONTHNAME9, LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; - BOOL formatAD = TRUE; + const WCHAR *formatEra = L""; WCHAR week[64], month[64]; WCHAR buf[192]; DateInstance *date; @@ -666,15 +666,15 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva year = year_from_time(date->time); if(year<0) { - formatAD = FALSE; + formatEra = L" B.C."; year = -year+1; } day = date_from_time(date->time); swprintf(buf, ARRAY_SIZE(buf), - formatAD ? L"%s, %d %s %d %02d:%02d:%02d UTC" : L"%s, %d %s %d B.C. %02d:%02d:%02d UTC", - week, day, month, year, (int)hour_from_time(date->time), (int)min_from_time(date->time), + L"%s, %d %s %d%s %02d:%02d:%02d UTC", week, day, month, year, formatEra, + (int)hour_from_time(date->time), (int)min_from_time(date->time), (int)sec_from_time(date->time)); date_str = jsstr_alloc(buf); @@ -714,7 +714,7 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) LOCALE_SABBREVMONTHNAME9, LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; - BOOL formatAD = TRUE; + const WCHAR *formatEra = L""; WCHAR week[64], month[64]; WCHAR buf[192]; jsstr_t *date_str; @@ -741,14 +741,13 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) year = year_from_time(time); if(year<0) { - formatAD = FALSE; + formatEra = L" B.C."; year = -year+1; } day = date_from_time(time); - swprintf(buf, ARRAY_SIZE(buf), formatAD ? L"%s %s %d %d" : L"%s %s %d %d B.C.", week, month, - day, year); + swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %d%s", week, month, day, year, formatEra); date_str = jsstr_alloc(buf); if(!date_str) -- 2.23.0

Dec. 1, 2020

[PATCH 1/2] jscript: Use wide-char string literals.

by Jeff Smith

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/jscript/decode.c | 11 ++++------- dlls/jscript/function.c | 34 +++++++++++++++------------------- dlls/jscript/jsutils.c | 6 ++---- dlls/jscript/parser.y | 4 +--- dlls/jscript/string.c | 4 +--- 5 files changed, 23 insertions(+), 36 deletions(-) diff --git a/dlls/jscript/decode.c b/dlls/jscript/decode.c index 283aa2ed947..b121c34b70e 100644 --- a/dlls/jscript/decode.c +++ b/dlls/jscript/decode.c @@ -113,14 +113,11 @@ HRESULT decode_source(WCHAR *code) const WCHAR *src = code; WCHAR *dst = code; - static const WCHAR decode_beginW[] = {'#','@','~','^'}; - static const WCHAR decode_endW[] = {'^','#','~','@'}; - while(*src) { - if(!wcsncmp(src, decode_beginW, ARRAY_SIZE(decode_beginW))) { + if(!wcscmp(src, L"#@~^")) { DWORD len, i, j=0, csum, s=0; - src += ARRAY_SIZE(decode_beginW); + src += lstrlenW(L"#@~^"); if(!decode_dword(src, &len)) return JS_E_INVALID_CHAR; @@ -165,9 +162,9 @@ HRESULT decode_source(WCHAR *code) return JS_E_INVALID_CHAR; src += 8; - if(wcsncmp(src, decode_endW, ARRAY_SIZE(decode_endW))) + if(wcscmp(src, L"^#~@")) return JS_E_INVALID_CHAR; - src += ARRAY_SIZE(decode_endW); + src += lstrlenW(L"^#~@"); }else { *dst++ = *src++; } diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 9f6aa4b4ec6..f3b40d22865 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -616,24 +616,20 @@ static HRESULT NativeFunction_call(script_ctx_t *ctx, FunctionInstance *func, ID static HRESULT NativeFunction_toString(FunctionInstance *func, jsstr_t **ret) { NativeFunction *function = (NativeFunction*)func; - DWORD name_len; + DWORD str_len; jsstr_t *str; WCHAR *ptr; - static const WCHAR native_prefixW[] = {'\n','f','u','n','c','t','i','o','n',' '}; - static const WCHAR native_suffixW[] = - {'(',')',' ','{','\n',' ',' ',' ',' ','[','n','a','t','i','v','e',' ','c','o','d','e',']','\n','}','\n'}; + static const WCHAR native_formatW[] = L"\nfunction %s() {\n [native code]\n}\n"; - name_len = function->name ? lstrlenW(function->name) : 0; - str = jsstr_alloc_buf(ARRAY_SIZE(native_prefixW) + ARRAY_SIZE(native_suffixW) + name_len, &ptr); + str_len = lstrlenW(native_formatW) - 2; + if(function->name) + str_len += lstrlenW(function->name); + str = jsstr_alloc_buf(str_len, &ptr); if(!str) return E_OUTOFMEMORY; - memcpy(ptr, native_prefixW, sizeof(native_prefixW)); - ptr += ARRAY_SIZE(native_prefixW); - memcpy(ptr, function->name, name_len*sizeof(WCHAR)); - ptr += name_len; - memcpy(ptr, native_suffixW, sizeof(native_suffixW)); + swprintf(ptr, str_len+1, native_formatW, function->name ? function->name : L""); *ret = str; return S_OK; @@ -912,8 +908,8 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg int j = 0; HRESULT hres = S_OK; - static const WCHAR function_anonymousW[] = {'f','u','n','c','t','i','o','n',' ','a','n','o','n','y','m','o','u','s','('}; - static const WCHAR function_beginW[] = {')',' ','{','\n'}; + static const WCHAR function_anonymousW[] = L"function anonymous("; + static const WCHAR function_beginW[] = L") {\n"; static const WCHAR function_endW[] = L"\n}"; if(argc) { @@ -932,11 +928,11 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg } if(SUCCEEDED(hres)) { - len += ARRAY_SIZE(function_anonymousW) + ARRAY_SIZE(function_beginW) + ARRAY_SIZE(function_endW); + len += lstrlenW(function_anonymousW) + lstrlenW(function_beginW) + lstrlenW(function_endW) + 1; str = heap_alloc(len*sizeof(WCHAR)); if(str) { - memcpy(str, function_anonymousW, sizeof(function_anonymousW)); - ptr = str + ARRAY_SIZE(function_anonymousW); + memcpy(str, function_anonymousW, lstrlenW(function_anonymousW)*sizeof(WCHAR)); + ptr = str + lstrlenW(function_anonymousW); if(argc > 1) { while(1) { ptr += jsstr_flush(params[j], ptr); @@ -946,11 +942,11 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg *ptr++ = ' '; } } - memcpy(ptr, function_beginW, sizeof(function_beginW)); - ptr += ARRAY_SIZE(function_beginW); + memcpy(ptr, function_beginW, lstrlenW(function_beginW)*sizeof(WCHAR)); + ptr += lstrlenW(function_beginW); if(argc) ptr += jsstr_flush(params[argc-1], ptr); - memcpy(ptr, function_endW, sizeof(function_endW)); + memcpy(ptr, function_endW, (lstrlenW(function_endW)+1)*sizeof(WCHAR)); TRACE("%s\n", debugstr_w(str)); }else { diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 56e8306ba21..29075282e0b 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -494,8 +494,6 @@ static HRESULT str_to_number(jsstr_t *str, double *ret) BOOL neg = FALSE; DOUBLE d = 0.0; - static const WCHAR infinityW[] = {'I','n','f','i','n','i','t','y'}; - ptr = jsstr_flatten(str); if(!ptr) return E_OUTOFMEMORY; @@ -510,8 +508,8 @@ static HRESULT str_to_number(jsstr_t *str, double *ret) ptr++; } - if(!wcsncmp(ptr, infinityW, ARRAY_SIZE(infinityW))) { - ptr += ARRAY_SIZE(infinityW); + if(!wcscmp(ptr, L"Infinity")) { + ptr += lstrlenW(L"Infinity"); while(*ptr && iswspace(*ptr)) ptr++; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 6016be6cfd8..ba81668dbb3 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1573,14 +1573,12 @@ HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, byteco heap_pool_t *mark; HRESULT hres; - const WCHAR html_tagW[] = {'<','/','s','c','r','i','p','t','>',0}; - parser_ctx = heap_alloc_zero(sizeof(parser_ctx_t)); if(!parser_ctx) return E_OUTOFMEMORY; parser_ctx->error_loc = -1; - parser_ctx->is_html = delimiter && !wcsicmp(delimiter, html_tagW); + parser_ctx->is_html = delimiter && !wcsicmp(delimiter, L"</script>"); parser_ctx->begin = parser_ctx->ptr = code->source; parser_ctx->end = parser_ctx->begin + lstrlenW(parser_ctx->begin); diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 3dd40e6744f..694cca2b9bb 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -888,9 +888,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un if(FAILED(hres)) break; }else { - static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d'}; - - hres = strbuf_append(&ret, undefinedW, ARRAY_SIZE(undefinedW)); + hres = strbuf_append(&ret, L"undefined", lstrlenW(L"undefined")); if(FAILED(hres)) break; } -- 2.23.0

Dec. 1, 2020

Re: [PATCH v2 1/4] winegstreamer: Introduce audio conversion transform.

by Derek Lesho

On 12/1/20 3:00 PM, Zebediah Figura (she/her) wrote: > >> +HRESULT mfplat_DllRegisterServer(void) >> +{ >> + unsigned int i; >> + HRESULT hr; >> + >> + for (i = 0; i < ARRAY_SIZE(mfts); i++) >> + { >> + const struct mft *cur = &mfts[i]; >> + >> + MFT_REGISTER_TYPE_INFO *input_types, *output_types; >> + input_types = heap_alloc(cur->input_types_count * sizeof(input_types[0])); >> + output_types = heap_alloc(cur->output_types_count * sizeof(output_types[0])); > Separately, I think it'd be better just to use MFT_REGISTER_TYPE_INFO > directly in your "struct mft", and avoid allocation. It'd have to be > non-const (or duplicate GUID definitions), but I think that's less > awkward on the whole. I'm trying to implement this now, but I'm having trouble with it. MFT_REGISTER_TYPE_INFO consists of GUID value fields, not GUID pointer fields. I'm not sure if there's a clean way to fill GUID fields of a struct in an initialization list, even when the array is not const. I definitely don't want to duplicate the GUID definitions, that would be ugly. Also, I'm not sure I necessarily I agree this solution is better than just having some heap allocations in DllRegisterServer, it's not in what I would call a hotpath.

Dec. 1, 2020

Re: [PATCH v2 3/4] winegstreamer: Implement ::Process(Input/Output) for audio conversion transform.

by Zebediah Figura (she/her)

On 12/1/20 2:54 PM, Derek Lesho wrote: > >>> + /* audioconvert needs a valid channel-mask */ >> Well, that's not quite true, at least from my reading of the source, but >> it does need a valid channel mask for configurations other than mono or >> stereo. >> >> The code below is confusing, though; I'm not sure why channel-mask would >> be present in the caps at all. > Via MF_MT_AUDIO_CHANNEL_MASK. Indeed, I missed that, sorry. >> >> Note that a simpler way to set the channel mask is to use >> gst_audio_info_to_caps() in caps_from_mf_media_type(). > Mind if I just move this functionality to caps_from_mf_media_type? I > remember having problems with gst_audio_info_to_caps. > I don't think that makes very much sense in general, no. What problems did you have with gst_audio_info_to_caps()?

Dec. 1, 2020

Re: [PATCH v2 3/4] winegstreamer: Implement ::Process(Input/Output) for audio conversion transform.

by Derek Lesho

>> + /* audioconvert needs a valid channel-mask */ > Well, that's not quite true, at least from my reading of the source, but > it does need a valid channel mask for configurations other than mono or > stereo. > > The code below is confusing, though; I'm not sure why channel-mask would > be present in the caps at all. Via MF_MT_AUDIO_CHANNEL_MASK. > > Note that a simpler way to set the channel mask is to use > gst_audio_info_to_caps() in caps_from_mf_media_type(). Mind if I just move this functionality to caps_from_mf_media_type? I remember having problems with gst_audio_info_to_caps.

Dec. 1, 2020

Re: [PATCH v2 3/4] winegstreamer: Implement ::Process(Input/Output) for audio conversion transform.

by Zebediah Figura (she/her)

On 11/18/20 2:52 PM, Derek Lesho wrote: > Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> > --- > v2: Fix intermediate compile errors. > --- > dlls/winegstreamer/audioconvert.c | 202 +++++++++++++++++++++++++++++- > dlls/winegstreamer/gst_private.h | 1 + > dlls/winegstreamer/mfplat.c | 75 +++++++++++ > 3 files changed, 273 insertions(+), 5 deletions(-) > > diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c > index 04227d168ae..deb5ceb2f7c 100644 > --- a/dlls/winegstreamer/audioconvert.c > +++ b/dlls/winegstreamer/audioconvert.c > @@ -24,7 +24,8 @@ struct audio_converter > IMFMediaType *input_type; > IMFMediaType *output_type; > CRITICAL_SECTION cs; > - BOOL valid_state; > + BOOL valid_state, inflight; > + GstElement *container, *appsrc, *audioconvert, *resampler, *appsink; > }; > > static struct audio_converter *impl_audio_converter_from_IMFTransform(IMFTransform *iface) > @@ -69,6 +70,7 @@ static ULONG WINAPI audio_converter_Release(IMFTransform *iface) > if (!refcount) > { > DeleteCriticalSection(&transform->cs); > + gst_object_unref(transform->container); > heap_free(transform); > } > > @@ -261,22 +263,54 @@ static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface > static void audio_converter_update_pipeline_state(struct audio_converter *converter) > { > GstCaps *input_caps, *output_caps; > + GstStructure *input_structure, *output_structure; > + guint64 channels_in, channels_out, channel_mask = 0; > > if (!(converter->valid_state = converter->input_type && converter->output_type)) > + { > + gst_element_set_state(converter->container, GST_STATE_READY); > return; > + } > > if (!(input_caps = caps_from_mf_media_type(converter->input_type))) > { > converter->valid_state = FALSE; > + gst_element_set_state(converter->container, GST_STATE_READY); > return; > } > if (!(output_caps = caps_from_mf_media_type(converter->output_type))) > { > converter->valid_state = FALSE; > + gst_element_set_state(converter->container, GST_STATE_READY); > + gst_caps_unref(input_caps); > + return; > + } > + > + /* audioconvert needs a valid channel-mask */ Well, that's not quite true, at least from my reading of the source, but it does need a valid channel mask for configurations other than mono or stereo. The code below is confusing, though; I'm not sure why channel-mask would be present in the caps at all. Note that a simpler way to set the channel mask is to use gst_audio_info_to_caps() in caps_from_mf_media_type(). > + input_structure = gst_caps_get_structure(input_caps, 0); > + output_structure = gst_caps_get_structure(output_caps, 0); > + > + if (!gst_structure_get(input_structure, "channels", G_TYPE_INT, &channels_in, NULL) || > + !gst_structure_get(output_structure, "channels", G_TYPE_INT, &channels_out, NULL)) > + { > + converter->valid_state = FALSE; > + gst_element_set_state(converter->container, GST_STATE_READY); > gst_caps_unref(input_caps); > + gst_caps_unref(output_caps); > return; > } > > + gst_structure_get(input_structure, "channel-mask", GST_TYPE_BITMASK, &channel_mask, NULL); > + if (channel_mask == 0) > + gst_caps_set_simple(input_caps, "channel-mask", GST_TYPE_BITMASK, (guint64) (1 << channels_in) - 1, NULL); > + > + gst_structure_get(output_structure, "channel-mask", GST_TYPE_BITMASK, &channel_mask, NULL); > + if (channel_mask == 0) > + gst_caps_set_simple(output_caps, "channel-mask", GST_TYPE_BITMASK, (guint64) (1 << channels_out) - 1, NULL); > + > + g_object_set(converter->appsrc, "caps", input_caps, NULL); > + g_object_set(converter->appsink, "caps", output_caps, NULL); > + > if (TRACE_ON(mfplat)) > { > gchar *input_caps_str, *output_caps_str; > @@ -293,6 +327,7 @@ static void audio_converter_update_pipeline_state(struct audio_converter *conver > > gst_caps_unref(input_caps); > gst_caps_unref(output_caps); > + gst_element_set_state(converter->container, GST_STATE_PLAYING); > > return; > } > @@ -496,17 +531,114 @@ static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_ME > > static HRESULT WINAPI audio_converter_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) > { > - FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags); > + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); > + GstBuffer *gst_buffer; > + HRESULT hr = S_OK; > + int ret; > > - return E_NOTIMPL; > + TRACE("%p, %u, %p, %#x.\n", iface, id, sample, flags); > + > + if (flags) > + WARN("Unsupported flags %#x\n", flags); > + > + if (id != 0) > + return MF_E_INVALIDSTREAMNUMBER; > + > + EnterCriticalSection(&converter->cs); > + > + if (!converter->valid_state) > + { > + hr = MF_E_TRANSFORM_TYPE_NOT_SET; > + goto done; > + } > + > + if (converter->inflight) > + { > + hr = MF_E_NOTACCEPTING; > + goto done; > + } > + > + if (!(gst_buffer = gst_buffer_from_mf_sample(sample))) These parentheses are redundant (and I don't think particularly clarifying). The same applies to many other cases in this patch. > + { > + hr = E_FAIL; > + goto done; > + } > + > + g_signal_emit_by_name(converter->appsrc, "push-buffer", gst_buffer, &ret); > + gst_buffer_unref(gst_buffer); > + if (ret != GST_FLOW_OK) > + { > + ERR("Couldn't push buffer ret = %d\n", ret); gst_flow_get_name() may be a good idea here. > + hr = E_FAIL; > + goto done; > + } None of these gotos are actually saving you any lines. > + > + converter->inflight = TRUE; > + > + done: > + LeaveCriticalSection(&converter->cs); > + > + return hr; > } > > static HRESULT WINAPI audio_converter_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, > MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) > { > - FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); > + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); > + MFT_OUTPUT_DATA_BUFFER *relevant_buffer = NULL; > + GstSample *sample; > + HRESULT hr = S_OK; > + unsigned int i; > > - return E_NOTIMPL; > + TRACE("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); > + > + if (flags) > + WARN("Unsupported flags %#x\n", flags); > + > + for (i = 0; i < count; i++) > + { > + MFT_OUTPUT_DATA_BUFFER *out_buffer = &samples[i]; > + > + if (out_buffer->dwStreamID != 0) > + return MF_E_INVALIDSTREAMNUMBER; > + > + if (relevant_buffer) > + return MF_E_INVALIDSTREAMNUMBER; > + > + relevant_buffer = out_buffer; > + } > + > + if (!relevant_buffer) > + return S_OK; This code is very strange. Isn't it easier just to validate "count == 1"? And is it really correct to return MF_E_INVALIDSTREAMNUMBER if more than one sample is passed? > + > + EnterCriticalSection(&converter->cs); > + > + if (!converter->valid_state) > + { > + hr = MF_E_TRANSFORM_TYPE_NOT_SET; > + goto done; > + } > + > + if (!converter->inflight) > + { > + hr = MF_E_TRANSFORM_NEED_MORE_INPUT; > + goto done; > + } More gotos that don't save you anything. > + > + g_signal_emit_by_name(converter->appsink, "pull-sample", &sample); > + > + converter->inflight = FALSE; > + > + relevant_buffer->pSample = mf_sample_from_gst_buffer(gst_sample_get_buffer(sample)); > + gst_sample_unref(sample); > + relevant_buffer->dwStatus = S_OK; > + relevant_buffer->pEvents = NULL; > + *status = 0; > + > + done: > + LeaveCriticalSection(&converter->cs); > + > + return hr; > } > > static const IMFTransformVtbl audio_converter_vtbl = > @@ -542,6 +674,7 @@ static const IMFTransformVtbl audio_converter_vtbl = > HRESULT audio_converter_create(REFIID riid, void **ret) > { > struct audio_converter *object; > + HRESULT hr; > > TRACE("%s %p\n", debugstr_guid(riid), ret); > > @@ -553,6 +686,65 @@ HRESULT audio_converter_create(REFIID riid, void **ret) > > InitializeCriticalSection(&object->cs); > > + object->container = gst_bin_new(NULL); > + > + if (!(object->appsrc = gst_element_factory_make("appsrc", NULL))) > + { > + ERR("Failed to create appsrc"); I'd recommend including a message here about possibly missing gst-plugins-base (and similarly below), since it's a very common mistake for users to make. > + hr = E_FAIL; > + goto failed; > + } > + gst_bin_add(GST_BIN(object->container), object->appsrc); > + > + if (!(object->audioconvert = gst_element_factory_make("audioconvert", NULL))) > + { > + ERR("Failed to create converter\n"); > + hr = E_FAIL; > + goto failed; > + } > + gst_bin_add(GST_BIN(object->container), object->audioconvert); > + > + if (!(object->resampler = gst_element_factory_make("audioresample", NULL))) > + { > + ERR("Failed to create resampler\n"); > + hr = E_FAIL; > + goto failed; > + } > + gst_bin_add(GST_BIN(object->container), object->resampler); > + > + if (!(object->appsink = gst_element_factory_make("appsink", NULL))) > + { > + ERR("Failed to create appsink\n"); > + hr = E_FAIL; > + goto failed; > + } > + gst_bin_add(GST_BIN(object->container), object->appsink); > + > + if (!(gst_element_link(object->appsrc, object->audioconvert))) > + { > + ERR("Failed to link appsrc to audioconvert\n"); > + hr = E_FAIL; > + goto failed; > + } > + > + if (!(gst_element_link(object->audioconvert, object->resampler))) > + { > + ERR("Failed to link audioconvert to resampler\n"); > + hr = E_FAIL; > + goto failed; > + } > + > + if (!(gst_element_link(object->resampler, object->appsink))) > + { > + ERR("Failed to link resampler to appsink\n"); > + hr = E_FAIL; > + goto failed; > + } > + More gotos that don't save you anything. > *ret = &object->IMFTransform_iface; > return S_OK; > +failed: > + > + IMFTransform_Release(&object->IMFTransform_iface); > + return hr; > } > diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h > index 7889c996204..7f96c06dfaf 100644 > --- a/dlls/winegstreamer/gst_private.h > +++ b/dlls/winegstreamer/gst_private.h > @@ -81,6 +81,7 @@ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HI > IMFMediaType *mf_media_type_from_caps(const GstCaps *caps) DECLSPEC_HIDDEN; > GstCaps *caps_from_mf_media_type(IMFMediaType *type) DECLSPEC_HIDDEN; > IMFSample *mf_sample_from_gst_buffer(GstBuffer *in) DECLSPEC_HIDDEN; > +GstBuffer *gst_buffer_from_mf_sample(IMFSample *in) DECLSPEC_HIDDEN; > > HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; > > diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c > index 909fb8b3572..7fdf722ec2e 100644 > --- a/dlls/winegstreamer/mfplat.c > +++ b/dlls/winegstreamer/mfplat.c > @@ -877,3 +877,78 @@ done: > > return out; > } > + > +GstBuffer* gst_buffer_from_mf_sample(IMFSample *mf_sample) > +{ > + GstBuffer *out = gst_buffer_new(); > + IMFMediaBuffer *mf_buffer = NULL; > + LONGLONG duration, time; > + DWORD buffer_count; > + unsigned int i; > + HRESULT hr; > + > + if (FAILED(hr = IMFSample_GetSampleDuration(mf_sample, &duration))) > + goto fail; > + > + if (FAILED(hr = IMFSample_GetSampleTime(mf_sample, &time))) > + goto fail; > + > + GST_BUFFER_DURATION(out) = duration; > + GST_BUFFER_PTS(out) = time * 100; > + > + if (FAILED(hr = IMFSample_GetBufferCount(mf_sample, &buffer_count))) > + goto fail; > + > + for (i = 0; i < buffer_count; i++) > + { > + DWORD buffer_max_size, buffer_size; > + GstMapInfo map_info; > + GstMemory *memory; > + BYTE *buf_data; > + > + if (FAILED(hr = IMFSample_GetBufferByIndex(mf_sample, i, &mf_buffer))) > + goto fail; > + > + if (FAILED(hr = IMFMediaBuffer_GetMaxLength(mf_buffer, &buffer_max_size))) > + goto fail; This value is unused. > + > + if (FAILED(hr = IMFMediaBuffer_GetCurrentLength(mf_buffer, &buffer_size))) > + goto fail; > + > + memory = gst_allocator_alloc(NULL, buffer_size, NULL); > + gst_memory_resize(memory, 0, buffer_size); > + > + if (!(gst_memory_map(memory, &map_info, GST_MAP_WRITE))) > + { > + hr = E_FAIL; > + goto fail; > + } > + > + if (FAILED(hr = IMFMediaBuffer_Lock(mf_buffer, &buf_data, NULL, NULL))) > + goto fail; > + > + memcpy(map_info.data, buf_data, buffer_size); > + > + if (FAILED(hr = IMFMediaBuffer_Unlock(mf_buffer))) > + goto fail; > + > + if (FAILED(hr = IMFMediaBuffer_SetCurrentLength(mf_buffer, buffer_size))) > + goto fail; This doesn't look like it belongs here. > + > + gst_memory_unmap(memory, &map_info); > + > + gst_buffer_append_memory(out, memory); > + > + IMFMediaBuffer_Release(mf_buffer); > + mf_buffer = NULL; > + } > + > + return out; > + > +fail: > + ERR("Failed to copy IMFSample to GstBuffer, hr = %#x\n", hr); > + if (mf_buffer) > + IMFMediaBuffer_Release(mf_buffer); > + gst_buffer_unref(out); > + return NULL; > +} >

Dec. 1, 2020

Re: [PATCH v2 2/4] winegstreamer: Implement ::Set(Input/Output)Type for audio conversion transform.

by Derek Lesho

On 12/1/20 3:10 PM, Zebediah Figura (she/her) wrote: > This field is unused in this patch, but is there a reason its uses can't > be replaced with "converter->input_type && converter->output_type"? If the functionality of update_pipeline_state were moved to the validation stage of Set(Input/Output)Type, yes, that'd be possible. I'll do that. > >> }; >> >> static struct audio_converter *impl_audio_converter_from_IMFTransform(IMFTransform *iface) >> @@ -63,6 +68,7 @@ static ULONG WINAPI audio_converter_Release(IMFTransform *iface) >> >> if (!refcount) >> { >> + DeleteCriticalSection(&transform->cs); >> heap_free(transform); >> } >> >> @@ -252,18 +258,191 @@ static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface >> return hr; >> } >> >> +static void audio_converter_update_pipeline_state(struct audio_converter *converter) >> +{ >> + GstCaps *input_caps, *output_caps; >> + >> + if (!(converter->valid_state = converter->input_type && converter->output_type)) >> + return; >> + >> + if (!(input_caps = caps_from_mf_media_type(converter->input_type))) >> + { >> + converter->valid_state = FALSE; >> + return; >> + } >> + if (!(output_caps = caps_from_mf_media_type(converter->output_type))) >> + { >> + converter->valid_state = FALSE; >> + gst_caps_unref(input_caps); >> + return; >> + } >> + >> + if (TRACE_ON(mfplat)) >> + { >> + gchar *input_caps_str, *output_caps_str; >> + >> + input_caps_str = gst_caps_to_string(input_caps); >> + output_caps_str = gst_caps_to_string(output_caps); >> + >> + TRACE("Audio converter MFT configured to transform caps %s to caps %s\n", >> + debugstr_a(input_caps_str), debugstr_a(output_caps_str)); >> + >> + g_free(input_caps_str); >> + g_free(output_caps_str); >> + } >> + >> + gst_caps_unref(input_caps); >> + gst_caps_unref(output_caps); >> + >> + return; >> +} >> + > This function doesn't really do anything but trace; I'm not sure it > makes sense in this patch. I agree, even in the later patches where it does more, it just does the same thing twice for both the input and output type. It makes more sense to include it inline.+ >> + if (!found) >> + return MF_E_INVALIDTYPE; >> + } >> + >> + if (flags & MFT_SET_TYPE_TEST_ONLY) >> + return S_OK; > Wait, so what happens if MFT_SET_TYPE_TEST_ONLY is used with a NULL type? S_OK is returned, indicating that you can unset the input type.

Dec. 1, 2020

Re: [PATCH v2 2/4] winegstreamer: Implement ::Set(Input/Output)Type for audio conversion transform.

by Zebediah Figura (she/her)

On 11/18/20 2:52 PM, Derek Lesho wrote: > Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> > --- > v2: Fix intermediate compile errors. > --- > dlls/winegstreamer/audioconvert.c | 190 +++++++++++++++++++++++++++++- > 1 file changed, 185 insertions(+), 5 deletions(-) > As similar as the implementations of these two functions are, splitting the patch probably wouldn't be a bad thing. > diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c > index 91fa556cb88..04227d168ae 100644 > --- a/dlls/winegstreamer/audioconvert.c > +++ b/dlls/winegstreamer/audioconvert.c > @@ -1,4 +1,5 @@ > #include "config.h" > +#include <gst/gst.h> > > #include "gst_private.h" > > @@ -20,6 +21,10 @@ struct audio_converter > { > IMFTransform IMFTransform_iface; > LONG refcount; > + IMFMediaType *input_type; > + IMFMediaType *output_type; > + CRITICAL_SECTION cs; > + BOOL valid_state; This field is unused in this patch, but is there a reason its uses can't be replaced with "converter->input_type && converter->output_type"? > }; > > static struct audio_converter *impl_audio_converter_from_IMFTransform(IMFTransform *iface) > @@ -63,6 +68,7 @@ static ULONG WINAPI audio_converter_Release(IMFTransform *iface) > > if (!refcount) > { > + DeleteCriticalSection(&transform->cs); > heap_free(transform); > } > > @@ -252,18 +258,191 @@ static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface > return hr; > } > > +static void audio_converter_update_pipeline_state(struct audio_converter *converter) > +{ > + GstCaps *input_caps, *output_caps; > + > + if (!(converter->valid_state = converter->input_type && converter->output_type)) > + return; > + > + if (!(input_caps = caps_from_mf_media_type(converter->input_type))) > + { > + converter->valid_state = FALSE; > + return; > + } > + if (!(output_caps = caps_from_mf_media_type(converter->output_type))) > + { > + converter->valid_state = FALSE; > + gst_caps_unref(input_caps); > + return; > + } > + > + if (TRACE_ON(mfplat)) > + { > + gchar *input_caps_str, *output_caps_str; > + > + input_caps_str = gst_caps_to_string(input_caps); > + output_caps_str = gst_caps_to_string(output_caps); > + > + TRACE("Audio converter MFT configured to transform caps %s to caps %s\n", > + debugstr_a(input_caps_str), debugstr_a(output_caps_str)); > + > + g_free(input_caps_str); > + g_free(output_caps_str); > + } > + > + gst_caps_unref(input_caps); > + gst_caps_unref(output_caps); > + > + return; > +} > + This function doesn't really do anything but trace; I'm not sure it makes sense in this patch. > static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) > { > - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); > + unsigned int i; > + HRESULT hr; > > - return E_NOTIMPL; > + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); > + > + TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); > + > + if (id != 0) > + return MF_E_INVALIDSTREAMNUMBER; > + > + if (type) > + { > + GUID major_type, subtype; > + BOOL found = FALSE; > + DWORD unused; > + > + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type))) > + return MF_E_INVALIDTYPE; > + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) > + return MF_E_INVALIDTYPE; > + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &unused))) > + return MF_E_INVALIDTYPE; > + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &unused))) > + return MF_E_INVALIDTYPE; > + if (IsEqualGUID(&subtype, &MFAudioFormat_PCM) && FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &unused))) > + return MF_E_INVALIDTYPE; > + > + if (!(IsEqualGUID(&major_type, &MFMediaType_Audio))) > + return MF_E_INVALIDTYPE; > + > + for (i = 0; i < ARRAY_SIZE(raw_types); i++) > + { > + if (IsEqualGUID(&subtype, raw_types[i])) > + { > + found = TRUE; > + break; > + } > + } I guess I didn't notice this in patch 1/4, but raw_types seems a bit overkill when only two types are used (and it's not clear to me that more will be needed). > + > + if (!found) > + return MF_E_INVALIDTYPE; > + } > + > + if (flags & MFT_SET_TYPE_TEST_ONLY) > + return S_OK; Wait, so what happens if MFT_SET_TYPE_TEST_ONLY is used with a NULL type? > + > + hr = S_OK; > + > + EnterCriticalSection(&converter->cs); > + > + if (type) > + { > + if (!converter->input_type) > + if (FAILED(hr = MFCreateMediaType(&converter->input_type))) > + goto done; > + > + if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->input_type))) > + goto done; This "goto" is redundant. The former could potentially be made redundant as well. > + } > + else if (converter->input_type) > + { > + IMFMediaType_Release(converter->input_type); > + converter->input_type = NULL; > + } > + > + done: > + if (hr == S_OK) > + audio_converter_update_pipeline_state(converter); > + LeaveCriticalSection(&converter->cs); > + > + return S_OK; > } > > static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) > { > - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); > + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); > + GUID major_type, subtype; > + unsigned int i; > + DWORD unused; > + HRESULT hr; > > - return E_NOTIMPL; > + TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); > + > + if (id != 0) > + return MF_E_INVALIDSTREAMNUMBER; > + > + if (!converter->input_type) > + return MF_E_TRANSFORM_TYPE_NOT_SET; > + > + if (type) > + { > + /* validate the type */ > + > + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type))) > + return MF_E_INVALIDTYPE; > + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) > + return MF_E_INVALIDTYPE; > + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &unused))) > + return MF_E_INVALIDTYPE; > + if (IsEqualGUID(&subtype, &MFAudioFormat_PCM) && FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &unused))) > + return MF_E_INVALIDTYPE; > + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &unused))) > + return MF_E_INVALIDTYPE; > + > + if (!(IsEqualGUID(&major_type, &MFMediaType_Audio))) > + return MF_E_INVALIDTYPE; > + > + for (i = 0; i < ARRAY_SIZE(raw_types); i++) > + { > + if (IsEqualGUID(&subtype, raw_types[i])) > + break; > + if (i == ARRAY_SIZE(raw_types)) > + return MF_E_INVALIDTYPE; > + } > + } > + > + if (flags & MFT_SET_TYPE_TEST_ONLY) > + return S_OK; > + > + EnterCriticalSection(&converter->cs); > + > + hr = S_OK; > + > + if (type) > + { > + if (!converter->output_type) > + if (FAILED(hr = MFCreateMediaType(&converter->output_type))) > + goto done; > + > + if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->output_type))) > + goto done; > + } > + else if (converter->output_type) > + { > + IMFMediaType_Release(converter->output_type); > + converter->output_type = NULL; > + } > + > + done: > + if (hr == S_OK) > + audio_converter_update_pipeline_state(converter); > + LeaveCriticalSection(&converter->cs); > + > + return hr; > } > Most of the above comments apply here as well. > static HRESULT WINAPI audio_converter_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) > @@ -363,7 +542,6 @@ static const IMFTransformVtbl audio_converter_vtbl = > HRESULT audio_converter_create(REFIID riid, void **ret) > { > struct audio_converter *object; > - HRESULT hr; This should be part of the previous patch. > > TRACE("%s %p\n", debugstr_guid(riid), ret); > > @@ -373,6 +551,8 @@ HRESULT audio_converter_create(REFIID riid, void **ret) > object->IMFTransform_iface.lpVtbl = &audio_converter_vtbl; > object->refcount = 1; > > + InitializeCriticalSection(&object->cs); > + Can you please add debug info to the CS? > *ret = &object->IMFTransform_iface; > return S_OK; > } >

Dec. 1, 2020

Re: [PATCH v2 1/4] winegstreamer: Introduce audio conversion transform.

by Derek Lesho

On 12/1/20 3:00 PM, Zebediah Figura (she/her) wrote: >> +static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) >> +{ >> + FIXME("%p, %u.\n", iface, message); >> + >> + return S_OK; >> +} > Why S_OK? Because the media session sends some messages to the transform such as MFT_MESSAGE_NOTIFY_BEGIN_STREAMING and fails to play if S_OK isn't returned. I take it you'd like me to actually implement this method instead. > Why not CLSID_CResamplerMediaObject? In fact, we already have one > application that needs it (bug 47781). The only reason I didn't expose it as CLSID_CResamplerMediaObject is that I didn't want to imply that I was basing the interface and types supported off of that specific object. For instance, that object, from what I can see on the MSDN, doesn't support PCM<->Float conversions, and vice versa. Is this not a big enough deal to keep it separate?

Dec. 1, 2020

Re: [PATCH v2 1/4] winegstreamer: Introduce audio conversion transform.

by Zebediah Figura (she/her)

On 11/18/20 2:52 PM, Derek Lesho wrote: > Serves as a wrapper of audioconvert, and roughly fills the roll of Windows' CLSID_CResamplerMediaObject to convert audio to the format accepted by the streaming audio renderer. Spelling error: "roll" > > Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> > --- > v2: Fix intermediate compile errors. > --- > dlls/winegstreamer/Makefile.in | 1 + > dlls/winegstreamer/audioconvert.c | 378 +++++++++++++++++++ > dlls/winegstreamer/gst_private.h | 2 + > dlls/winegstreamer/mfplat.c | 77 ++++ > dlls/winegstreamer/winegstreamer_classes.idl | 6 + > 5 files changed, 464 insertions(+) > create mode 100644 dlls/winegstreamer/audioconvert.c > > diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in > index e578d194f7f..0b3229160b9 100644 > --- a/dlls/winegstreamer/Makefile.in > +++ b/dlls/winegstreamer/Makefile.in > @@ -6,6 +6,7 @@ EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) > PARENTSRC = ../strmbase > > C_SRCS = \ > + audioconvert.c \ > filter.c \ > gst_cbs.c \ > gstdemux.c \ > diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c > new file mode 100644 > index 00000000000..91fa556cb88 > --- /dev/null > +++ b/dlls/winegstreamer/audioconvert.c > @@ -0,0 +1,378 @@ > +#include "config.h" > + > +#include "gst_private.h" > + > +#include "mfapi.h" > +#include "mferror.h" > +#include "mfidl.h" > + > +#include "wine/debug.h" > +#include "wine/heap.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); > + > +static const GUID *raw_types[] = { > + &MFAudioFormat_PCM, > + &MFAudioFormat_Float, > +}; > + > +struct audio_converter > +{ > + IMFTransform IMFTransform_iface; > + LONG refcount; > +}; > + > +static struct audio_converter *impl_audio_converter_from_IMFTransform(IMFTransform *iface) > +{ > + return CONTAINING_RECORD(iface, struct audio_converter, IMFTransform_iface); > +} > + > +static HRESULT WINAPI audio_converter_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) > +{ > + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); > + > + if (IsEqualIID(riid, &IID_IMFTransform) || > + IsEqualIID(riid, &IID_IUnknown)) > + { > + *obj = iface; > + IMFTransform_AddRef(iface); > + return S_OK; > + } > + > + WARN("Unsupported %s.\n", debugstr_guid(riid)); > + *obj = NULL; > + return E_NOINTERFACE; > +} > + > +static ULONG WINAPI audio_converter_AddRef(IMFTransform *iface) > +{ > + struct audio_converter *transform = impl_audio_converter_from_IMFTransform(iface); > + ULONG refcount = InterlockedIncrement(&transform->refcount); > + > + TRACE("%p, refcount %u.\n", iface, refcount); > + > + return refcount; > +} > + > +static ULONG WINAPI audio_converter_Release(IMFTransform *iface) > +{ > + struct audio_converter *transform = impl_audio_converter_from_IMFTransform(iface); > + ULONG refcount = InterlockedDecrement(&transform->refcount); > + > + TRACE("%p, refcount %u.\n", iface, refcount); > + > + if (!refcount) > + { > + heap_free(transform); > + } > + > + return refcount; > +} > + > +static HRESULT WINAPI audio_converter_GetStreamLimits(IMFTransform *iface, DWORD *input_minimum, DWORD *input_maximum, > + DWORD *output_minimum, DWORD *output_maximum) > +{ > + TRACE("%p, %p, %p, %p, %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum); > + > + *input_minimum = *input_maximum = *output_minimum = *output_maximum = 1; > + > + return S_OK; > +} > + > +static HRESULT WINAPI audio_converter_GetStreamCount(IMFTransform *iface, DWORD *inputs, DWORD *outputs) > +{ > + TRACE("%p, %p, %p.\n", iface, inputs, outputs); > + > + *inputs = *outputs = 1; > + > + return S_OK; > +} > + > +static HRESULT WINAPI audio_converter_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs, > + DWORD output_size, DWORD *outputs) > +{ > + TRACE("%p %u %p %u %p.\n", iface, input_size, inputs, output_size, outputs); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) > +{ > + FIXME("%p %u %p.\n", iface, id, info); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) > +{ > + FIXME("%p %u %p.\n", iface, id, info); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) > +{ > + FIXME("%p, %p.\n", iface, attributes); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputStreamAttributes(IMFTransform *iface, DWORD id, > + IMFAttributes **attributes) > +{ > + FIXME("%p, %u, %p.\n", iface, id, attributes); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, > + IMFAttributes **attributes) > +{ > + FIXME("%p, %u, %p.\n", iface, id, attributes); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_DeleteInputStream(IMFTransform *iface, DWORD id) > +{ > + TRACE("%p, %u.\n", iface, id); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids) > +{ > + TRACE("%p, %u, %p.\n", iface, streams, ids); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, > + IMFMediaType **type) > +{ > + IMFMediaType *ret; > + HRESULT hr; > + > + TRACE("%p, %u, %u, %p.\n", iface, id, index, type); > + > + if (id != 0) > + return MF_E_INVALIDSTREAMNUMBER; > + > + if (index >= ARRAY_SIZE(raw_types)) > + return MF_E_NO_MORE_TYPES; > + > + if (FAILED(hr = MFCreateMediaType(&ret))) > + return hr; > + > + if (FAILED(hr = IMFMediaType_SetGUID(ret, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio))) > + { > + IMFMediaType_Release(ret); > + return hr; > + } > + > + if (FAILED(hr = IMFMediaType_SetGUID(ret, &MF_MT_SUBTYPE, raw_types[index]))) > + { > + IMFMediaType_Release(ret); > + return hr; > + } > + > + *type = ret; > + > + return S_OK; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index, > + IMFMediaType **type) > +{ > + IMFMediaType *output_type; > + HRESULT hr; > + > + static const DWORD rates[] = {44100, 48000}; > + static const DWORD channel_cnts[] = {1, 2, 6}; > + static const DWORD sizes[] = {16, 24, 32}; > + const GUID *subtype; > + DWORD rate, channels, bps; > + > + TRACE("%p, %u, %u, %p.\n", iface, id, index, type); > + > + if (id != 0) > + return MF_E_INVALIDSTREAMNUMBER; > + > + if (index >= (2/*rates*/ * 3/*layouts*/ * 3/*bps PCM*/) + (2 * 3)) > + return MF_E_NO_MORE_TYPES; > + > + if (FAILED(hr = MFCreateMediaType(&output_type))) > + return hr; > + > + if (index < 2 * 3 * 3) > + { > + subtype = &MFAudioFormat_PCM; > + rate = rates[index % 2]; > + channels = channel_cnts[(index / 2) % 3]; > + bps = sizes[(index / (2*3)) % 3]; > + } > + else > + { > + index -= (2 * 3 * 3); > + subtype = &MFAudioFormat_Float; > + bps = 32; > + rate = rates[index % 2]; > + channels = channel_cnts[(index / 2) % 3]; > + } > + This is mildly awkward; perhaps it would be better to replace "sizes" with something like static const struct { const GUID *subtype; DWORD depth; } formats[] = { {&MFAudioFormat_PCM, 16}, {&MFAudioFormat_PCM, 24}, {&MFAudioFormat_PCM, 32}, {&MFAudioFormat_Float, 32}, }; > + > + if (FAILED(hr = IMFMediaType_SetGUID(output_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio))) > + goto fail; > + if (FAILED(hr = IMFMediaType_SetGUID(output_type, &MF_MT_SUBTYPE, subtype))) > + goto fail; > + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, rate))) > + goto fail; > + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_NUM_CHANNELS, channels))) > + goto fail; > + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, bps))) > + goto fail; > + > + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, channels * bps / 8))) > + goto fail; > + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, rate * channels * bps / 8))) > + goto fail; > + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_CHANNEL_MASK, > + channels == 1 ? SPEAKER_FRONT_CENTER : > + channels == 2 ? SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT : > + /*channels == 6*/ 0x3F))) These are KSAUDIO_SPEAKER_MONO, KSAUDIO_SPEAKER_STEREO, and KSAUDIO_SPEAKER_5POINT1 respectively. > + goto fail; > + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE))) > + goto fail; > + > + *type = output_type; > + > + return S_OK; > + fail: Please don't insert tabs before labels; it makes them look like regular statements. > + IMFMediaType_Release(output_type); > + return hr; > +} > + I'm not sure why this function (and some of the others here) weren't split out into a separate patch like e.g. SetInputType(). Personally I'd recommend splitting out the implementations of all functions. > +static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) > +{ > + FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) > +{ > + FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) > +{ > + FIXME("%p, %u, %p.\n", iface, id, type); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) > +{ > + FIXME("%p, %u, %p.\n", iface, id, type); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags) > +{ > + FIXME("%p, %u, %p.\n", iface, id, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputStatus(IMFTransform *iface, DWORD *flags) > +{ > + FIXME("%p, %p.\n", iface, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) > +{ > + FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(lower), wine_dbgstr_longlong(upper)); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event) > +{ > + TRACE("%p, %u, %p.\n", iface, id, event); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) > +{ > + FIXME("%p, %u.\n", iface, message); > + > + return S_OK; > +} Why S_OK? > + > +static HRESULT WINAPI audio_converter_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) > +{ > + FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, > + MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) > +{ > + FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); > + > + return E_NOTIMPL; > +} > + > +static const IMFTransformVtbl audio_converter_vtbl = > +{ > + audio_converter_QueryInterface, > + audio_converter_AddRef, > + audio_converter_Release, > + audio_converter_GetStreamLimits, > + audio_converter_GetStreamCount, > + audio_converter_GetStreamIDs, > + audio_converter_GetInputStreamInfo, > + audio_converter_GetOutputStreamInfo, > + audio_converter_GetAttributes, > + audio_converter_GetInputStreamAttributes, > + audio_converter_GetOutputStreamAttributes, > + audio_converter_DeleteInputStream, > + audio_converter_AddInputStreams, > + audio_converter_GetInputAvailableType, > + audio_converter_GetOutputAvailableType, > + audio_converter_SetInputType, > + audio_converter_SetOutputType, > + audio_converter_GetInputCurrentType, > + audio_converter_GetOutputCurrentType, > + audio_converter_GetInputStatus, > + audio_converter_GetOutputStatus, > + audio_converter_SetOutputBounds, > + audio_converter_ProcessEvent, > + audio_converter_ProcessMessage, > + audio_converter_ProcessInput, > + audio_converter_ProcessOutput, > +}; > + > +HRESULT audio_converter_create(REFIID riid, void **ret) > +{ > + struct audio_converter *object; > + HRESULT hr; > + > + TRACE("%s %p\n", debugstr_guid(riid), ret); > + > + if (!(object = heap_alloc_zero(sizeof(*object)))) > + return E_OUTOFMEMORY; > + > + object->IMFTransform_iface.lpVtbl = &audio_converter_vtbl; > + object->refcount = 1; > + > + *ret = &object->IMFTransform_iface; > + return S_OK; > +} > diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h > index 28e424439d8..7889c996204 100644 > --- a/dlls/winegstreamer/gst_private.h > +++ b/dlls/winegstreamer/gst_private.h > @@ -84,4 +84,6 @@ IMFSample *mf_sample_from_gst_buffer(GstBuffer *in) DECLSPEC_HIDDEN; > > HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; > > +HRESULT audio_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; > + > #endif /* __GST_PRIVATE_INCLUDED__ */ > diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c > index 3d224a5accc..909fb8b3572 100644 > --- a/dlls/winegstreamer/mfplat.c > +++ b/dlls/winegstreamer/mfplat.c > @@ -405,6 +405,8 @@ failed: > > static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}}; > > +static GUID CLSID_WINEAudioConverter = {0x6a170414,0xaad9,0x4693,{0xb8,0x06,0x3a,0x0c,0x47,0xc5,0x70,0xd6}}; > + Why not CLSID_CResamplerMediaObject? In fact, we already have one application that needs it (bug 47781). Also, this can be const. > static const struct class_object > { > const GUID *clsid; > @@ -414,6 +416,7 @@ class_objects[] = > { > { &CLSID_VideoProcessorMFT, &video_processor_create }, > { &CLSID_GStreamerByteStreamHandler, &winegstreamer_stream_handler_create }, > + { &CLSID_WINEAudioConverter, &audio_converter_create }, > }; > > HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) > @@ -442,6 +445,80 @@ HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) > return CLASS_E_CLASSNOTAVAILABLE; > } > > +static WCHAR audio_converterW[] = {'A','u','d','i','o',' ','C','o','n','v','e','r','t','e','r',0}; > +const GUID *audio_converter_supported_types[] = Missing "static" here. > +{ > + &MFAudioFormat_PCM, > + &MFAudioFormat_Float, > +}; > + > +static const struct mft > +{ > + const GUID *clsid; > + const GUID *category; > + LPWSTR name; > + const UINT32 flags; > + const GUID *major_type; > + const UINT32 input_types_count; > + const GUID **input_types; > + const UINT32 output_types_count; > + const GUID **output_types; > + IMFAttributes *attributes; > +} > +mfts[] = > +{ > + { > + &CLSID_WINEAudioConverter, > + &MFT_CATEGORY_AUDIO_EFFECT, > + audio_converterW, > + MFT_ENUM_FLAG_SYNCMFT, > + &MFMediaType_Audio, > + ARRAY_SIZE(audio_converter_supported_types), > + audio_converter_supported_types, > + ARRAY_SIZE(audio_converter_supported_types), > + audio_converter_supported_types, > + NULL > + }, > +}; > + > +HRESULT mfplat_DllRegisterServer(void) > +{ > + unsigned int i; > + HRESULT hr; > + > + for (i = 0; i < ARRAY_SIZE(mfts); i++) > + { > + const struct mft *cur = &mfts[i]; > + > + MFT_REGISTER_TYPE_INFO *input_types, *output_types; > + input_types = heap_alloc(cur->input_types_count * sizeof(input_types[0])); > + output_types = heap_alloc(cur->output_types_count * sizeof(output_types[0])); This is some confusing spacing. I expect either a blank line after all declarations or no blank line at all, but this makes me think "wait, where's input_types declared?" Separately, I think it'd be better just to use MFT_REGISTER_TYPE_INFO directly in your "struct mft", and avoid allocation. It'd have to be non-const (or duplicate GUID definitions), but I think that's less awkward on the whole. > + for (i = 0; i < cur->input_types_count; i++) > + { > + input_types[i].guidMajorType = *(cur->major_type); > + input_types[i].guidSubtype = *(cur->input_types[i]); > + } > + for (i = 0; i < cur->output_types_count; i++) > + { > + output_types[i].guidMajorType = *(cur->major_type); > + output_types[i].guidSubtype = *(cur->output_types[i]); > + } > + > + hr = MFTRegister(*(cur->clsid), *(cur->category), cur->name, cur->flags, cur->input_types_count, > + input_types, cur->output_types_count, output_types, cur->attributes); > + > + heap_free(input_types); > + heap_free(output_types); > + > + if (FAILED(hr)) > + { > + FIXME("Failed to register MFT, hr %#x\n", hr); > + return hr; > + } > + } > + return S_OK; > +} > + This registration could also be a separate patch. > static const struct > { > const GUID *subtype; > diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl > index 1dc4ba9a10b..cf1fc69f38a 100644 > --- a/dlls/winegstreamer/winegstreamer_classes.idl > +++ b/dlls/winegstreamer/winegstreamer_classes.idl > @@ -61,3 +61,9 @@ coclass VideoProcessorMFT {} > uuid(317df618-5e5a-468a-9f15-d827a9a08162) > ] > coclass GStreamerByteStreamHandler {} > + > +[ > + threading(both), > + uuid(6a170414-aad9-4693-b806-3a0c47c570d6) > +] > +coclass WINEAudioConverter { } >

Dec. 1, 2020

Re: [PATCH] shdocvw: Use wide-char string literals.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

Dec. 1, 2020

[PATCH] server: Block console write until conhost processes ioctl.

by Jacek Caban

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50236 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 2 -- 1 file changed, 2 deletions(-)

Dec. 1, 2020

[PATCH 5/5] d3d11: Don't explicitly check for cube map support.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Always consider them supported whenever the format is otherwise available instead. The idea is to avoid referring to WINED3DUSAGE_LEGACY_CUBEMAP in d3d11. dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2a08d2b1e65..50e8cd58fe2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3315,7 +3315,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE1D}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE2D}, {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE3D}, - {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_LEGACY_CUBEMAP, D3D11_FORMAT_SUPPORT_TEXTURECUBE}, {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, 0, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, {WINED3D_RTYPE_NONE, WINED3D_BIND_DEPTH_STENCIL, 0, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL}, {WINED3D_RTYPE_NONE, WINED3D_BIND_UNORDERED_ACCESS, 0, D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW}, @@ -3364,6 +3363,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * { *format_support |= D3D11_FORMAT_SUPPORT_SHADER_LOAD; *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE; + *format_support |= D3D11_FORMAT_SUPPORT_TEXTURECUBE; if (feature_level >= D3D_FEATURE_LEVEL_10_1) *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER; -- 2.26.2

Dec. 1, 2020

[PATCH 4/5] d3d9/tests: Make a variable static const.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7c0a0157389..504d276d6c5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16799,7 +16799,7 @@ static void fp_special_test(void) 0x0000ffff, /* end */ }; - struct + static const struct { float x, y, z; float s; -- 2.26.2

Dec. 1, 2020

[PATCH 3/5] wined3d: Get rid of an unnecessary assignment.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/view.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4db3746d8de..1abbbac4fb4 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1409,7 +1409,6 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) struct wined3d_context_gl *context_gl; context_gl = wined3d_context_gl(context_acquire(resource->device, NULL, 0)); - gl_info = context_gl->gl_info; create_buffer_view(&view_gl->gl_view, &context_gl->c, desc, buffer, view_gl->v.format); if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) { -- 2.26.2

Dec. 1, 2020

[PATCH 2/5] wined3d: Allow forcing adapter commands serialization in the CS.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/cs.c | 18 ++++++++++++++++++ dlls/wined3d/wined3d_main.c | 15 +++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 37 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 48b73a71fe4..4b71f910048 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -21,6 +21,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(d3d_synchronous); WINE_DECLARE_DEBUG_CHANNEL(fps); #define WINED3D_INITIAL_CS_SIZE 4096 @@ -2866,6 +2867,18 @@ static void wined3d_cs_wait_event(struct wined3d_cs *cs) WaitForSingleObject(cs->event, INFINITE); } +static void wined3d_cs_adapter_lock(const struct wined3d_cs *cs) +{ + if (cs->serialize_adapter) + EnterCriticalSection(&wined3d_adapter_cs); +} + +static void wined3d_cs_adapter_unlock(const struct wined3d_cs *cs) +{ + if (cs->serialize_adapter) + LeaveCriticalSection(&wined3d_adapter_cs); +} + static DWORD WINAPI wined3d_cs_run(void *ctx) { struct wined3d_cs_packet *packet; @@ -2889,7 +2902,9 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) { if (++poll == WINED3D_CS_QUERY_POLL_INTERVAL) { + wined3d_cs_adapter_lock(cs); poll_queries(cs); + wined3d_cs_adapter_unlock(cs); poll = 0; } @@ -2920,7 +2935,9 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) break; } + wined3d_cs_adapter_lock(cs); wined3d_cs_op_handlers[opcode](cs, packet->data); + wined3d_cs_adapter_unlock(cs); TRACE("%s executed.\n", debug_cs_op(opcode)); } @@ -2945,6 +2962,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) cs->ops = &wined3d_cs_st_ops; cs->device = device; + cs->serialize_adapter = TRACE_ON(d3d_synchronous) || wined3d_settings.serialize_adapter; state_init(&cs->state, d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index e1ed86e80ed..43653d6dbc1 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -96,6 +96,16 @@ static CRITICAL_SECTION_DEBUG wined3d_wndproc_cs_debug = }; static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, 0, 0, 0}; +CRITICAL_SECTION wined3d_adapter_cs; +static CRITICAL_SECTION_DEBUG wined3d_adapter_cs_debug = +{ + 0, 0, &wined3d_adapter_cs, + {&wined3d_adapter_cs_debug.ProcessLocksList, + &wined3d_adapter_cs_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": wined3d_adapter_cs")} +}; +CRITICAL_SECTION wined3d_adapter_cs = {&wined3d_adapter_cs_debug, -1, 0, 0, 0, 0}; + /* When updating default value here, make sure to update winecfg as well, * where appropriate. */ struct wined3d_settings wined3d_settings = @@ -111,6 +121,7 @@ struct wined3d_settings wined3d_settings = ~0u, /* Don't force a specific sample count by default. */ FALSE, /* Don't range check relative addressing indices in float constants. */ FALSE, /* No strict shader math by default. */ + FALSE, /* Don't synchronize adapter commands by default. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No HS shader model limit by default. */ ~0U, /* No DS shader model limit by default. */ @@ -392,6 +403,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.renderer = WINED3D_RENDERER_NO3D; } } + if (!get_config_key_dword(hkey, appkey, "serialize_adapter", &wined3d_settings.serialize_adapter)) + ERR_(winediag)("Setting serialize_adapter to %#x.\n", wined3d_settings.serialize_adapter); } if (appkey) RegCloseKey( appkey ); @@ -436,6 +449,8 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) heap_free(wined3d_settings.logo); UnregisterClassA(WINED3D_OPENGL_WINDOW_CLASS_NAME, hInstDLL); + DeleteCriticalSection(&wined3d_adapter_cs); + DeleteCriticalSection(&wined3d_wndproc_cs); DeleteCriticalSection(&wined3d_cs); return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ab2543e52eb..6ed8d3c2d7d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -434,6 +434,7 @@ struct wined3d_settings unsigned int sample_count; BOOL check_float_constants; unsigned int strict_shader_math; + unsigned int serialize_adapter; unsigned int max_sm_vs; unsigned int max_sm_hs; unsigned int max_sm_ds; @@ -4640,6 +4641,7 @@ struct wined3d_cs HMODULE wined3d_module; HANDLE thread; DWORD thread_id; + BOOL serialize_adapter; struct wined3d_cs_queue queue[WINED3D_CS_QUEUE_COUNT]; size_t data_size, start, end; @@ -6323,4 +6325,6 @@ static inline void wined3d_context_gl_reference_bo(struct wined3d_context_gl *co /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" +extern CRITICAL_SECTION wined3d_adapter_cs; + #endif -- 2.26.2

Dec. 1, 2020

[PATCH 1/5] include: Extend debug channel name size to 31 bytes.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- I was testing the next patch in the series and I noticed that +d3d_synchronous didn't work at all... include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index e064aaefb8e..e505a0a333a 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -52,7 +52,7 @@ enum __wine_debug_class struct __wine_debug_channel { unsigned char flags; - char name[15]; + char name[31]; }; #ifndef WINE_NO_TRACE_MSGS -- 2.26.2

Dec. 1, 2020

[PATCH 5/5] wined3d: Reference the stream output bo in context_load_stream_output_buffers().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 15 --------------- dlls/wined3d/context_gl.c | 21 ++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b52df0bd11e..2dd4780b8ad 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -455,18 +455,3 @@ void context_load_unordered_access_resources(struct wined3d_context *context, context->uses_uavs = 1; } } - -void context_load_stream_output_buffers(struct wined3d_context *context, const struct wined3d_state *state) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) - { - struct wined3d_buffer *buffer; - if (!(buffer = state->stream_output[i].buffer)) - continue; - - wined3d_buffer_load(buffer, context, state); - wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); - } -} diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index d0c2f707ed0..13e4fa69ea7 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3684,6 +3684,25 @@ static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_contex checkGLcall("Bind unordered access views"); } +static void context_gl_load_stream_output_buffers(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) + { + struct wined3d_buffer_gl *buffer_gl; + + if (!state->stream_output[i].buffer) + continue; + + buffer_gl = wined3d_buffer_gl(state->stream_output[i].buffer); + wined3d_buffer_load(&buffer_gl->b, &context_gl->c, state); + wined3d_buffer_invalidate_location(&buffer_gl->b, ~WINED3D_LOCATION_BUFFER); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + } +} + /* Context activation is done by the caller. */ static BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state, BOOL indexed) @@ -3716,7 +3735,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); - context_load_stream_output_buffers(context, state); + context_gl_load_stream_output_buffers(context_gl, state); /* TODO: Right now the dependency on the vertex shader is necessary * since wined3d_stream_info_from_declaration() depends on the reg_maps of * the current VS but maybe it's possible to relax the coupling in some diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a7baff857d0..ab2543e52eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2117,8 +2117,6 @@ void wined3d_context_cleanup(struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void context_load_shader_resources(struct wined3d_context *context, const struct wined3d_state *state, unsigned int shader_mask) DECLSPEC_HIDDEN; -void context_load_stream_output_buffers(struct wined3d_context *context, - const struct wined3d_state *state) DECLSPEC_HIDDEN; void context_load_unordered_access_resources(struct wined3d_context *context, const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) DECLSPEC_HIDDEN; void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; -- 2.20.1

Dec. 1, 2020

[PATCH 4/5] wined3d: Reference the indirect buffer bo in dispatch_compute().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 419fc4923bd..d0c2f707ed0 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4107,6 +4107,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer_gl->bo.id)); GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0)); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); } else { -- 2.20.1

Dec. 1, 2020

[PATCH 3/5] wined3d: Reference the indirect buffer bo in wined3d_context_gl_draw_indirect().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 4aaf50434a6..419fc4923bd 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4488,8 +4488,8 @@ static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_ const struct wined3d_indirect_draw_parameters *parameters, unsigned int idx_size) { GLenum gl_primitive_type = gl_primitive_type_from_d3d(state->primitive_type); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(parameters->buffer); const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_buffer *buffer = parameters->buffer; const void *offset; if (!gl_info->supported[ARB_DRAW_INDIRECT]) @@ -4498,7 +4498,7 @@ static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_ return; } - GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, wined3d_buffer_gl(buffer)->bo.id)); + GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer_gl->bo.id)); offset = (void *)(GLintptr)parameters->offset; if (idx_size) @@ -4514,6 +4514,7 @@ static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_ } GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0)); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); checkGLcall("draw indirect"); } -- 2.20.1

Dec. 1, 2020

[PATCH 2/5] wined3d: Reference the bo in wined3d_unordered_access_view_gl_clear_uint().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/view.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4c85e2fefe4..4db3746d8de 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1348,6 +1348,7 @@ void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access wined3d_context_gl_bind_bo(context_gl, buffer_gl->bo.binding, buffer_gl->bo.id); GL_EXTCALL(glClearBufferSubData(buffer_gl->bo.binding, format->internal, offset, size, format->format, format->type, clear_value)); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); checkGLcall("clear unordered access view"); } -- 2.20.1

Dec. 1, 2020