December 2020 - Wine-commits

Derek Lesho : winegstreamer: Register the audio conversion transform.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 508b124f806133e97e558e479d8d470b07b144a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=508b124f806133e97e558e47… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Dec 3 11:42:19 2020 -0500 winegstreamer: Register the audio conversion transform. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 3 +- dlls/winegstreamer/mfplat.c | 69 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 7889c996204..9518f721504 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -76,6 +76,7 @@ BOOL init_gstreamer(void) DECLSPEC_HIDDEN; void start_dispatch_thread(void) DECLSPEC_HIDDEN; extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; +extern HRESULT mfplat_DllRegisterServer(void) DECLSPEC_HIDDEN; HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; IMFMediaType *mf_media_type_from_caps(const GstCaps *caps) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 4ca371d58bd..385c5550235 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -368,7 +368,8 @@ HRESULT WINAPI DllRegisterServer(void) IFilterMapper2_RegisterFilter(mapper, &CLSID_WAVEParser, wave_parserW, NULL, NULL, NULL, &reg_wave_parser); IFilterMapper2_Release(mapper); - return S_OK; + + return mfplat_DllRegisterServer(); } HRESULT WINAPI DllUnregisterServer(void) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 095a9b81091..f300988fc5c 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -445,6 +445,75 @@ 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}; +static const GUID *audio_converter_supported_types[] = +{ + &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, j; + HRESULT hr; + MFT_REGISTER_TYPE_INFO input_types[2], output_types[2]; + + for (i = 0; i < ARRAY_SIZE(mfts); i++) + { + const struct mft *cur = &mfts[i]; + + for (j = 0; j < cur->input_types_count; j++) + { + input_types[j].guidMajorType = *(cur->major_type); + input_types[j].guidSubtype = *(cur->input_types[j]); + } + for (j = 0; j < cur->output_types_count; j++) + { + output_types[j].guidMajorType = *(cur->major_type); + output_types[j].guidSubtype = *(cur->output_types[j]); + } + + hr = MFTRegister(*(cur->clsid), *(cur->category), cur->name, cur->flags, cur->input_types_count, + input_types, cur->output_types_count, output_types, cur->attributes); + + if (FAILED(hr)) + { + FIXME("Failed to register MFT, hr %#x\n", hr); + return hr; + } + } + return S_OK; +} + static const struct { const GUID *subtype;

1 0

Derek Lesho : winegstreamer: Implement ::GetInputAvailableType for audio conversion transform.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 8aa77a445017207ae3bea1fda4d91bf8991afceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aa77a445017207ae3bea1fd… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Dec 2 17:36:33 2020 -0500 winegstreamer: Implement ::GetInputAvailableType for audio conversion transform. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/audioconvert.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index 1c0fcf660c9..bba7d6f5830 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -166,9 +166,35 @@ static HRESULT WINAPI audio_converter_AddInputStreams(IMFTransform *iface, DWORD static HRESULT WINAPI audio_converter_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) { - FIXME("%p, %u, %u, %p.\n", iface, id, index, type); + IMFMediaType *ret; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %u, %p.\n", iface, id, index, type); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + if (index >= 2) + 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, index ? &MFAudioFormat_Float : &MFAudioFormat_PCM))) + { + IMFMediaType_Release(ret); + return hr; + } + + *type = ret; + + return S_OK; } static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index,

1 0

Derek Lesho : winegstreamer: Implement ::GetOutputAvailableType for audio conversion transform.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 8e6a4b239ae17ffad6d78dc17e628565f9a4c931 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e6a4b239ae17ffad6d78dc1… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Dec 2 17:36:34 2020 -0500 winegstreamer: Implement ::GetOutputAvailableType for audio conversion transform. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/audioconvert.c | 67 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index bba7d6f5830..8948281fa18 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -200,9 +200,72 @@ static HRESULT WINAPI audio_converter_GetInputAvailableType(IMFTransform *iface, static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) { - FIXME("%p, %u, %u, %p.\n", iface, id, index, type); + IMFMediaType *output_type; + HRESULT hr; - return E_NOTIMPL; + static const struct + { + const GUID *subtype; + DWORD depth; + } + formats[] = + { + {&MFAudioFormat_PCM, 16}, + {&MFAudioFormat_PCM, 24}, + {&MFAudioFormat_PCM, 32}, + {&MFAudioFormat_Float, 32}, + }; + + static const DWORD rates[] = {44100, 48000}; + static const DWORD channel_cnts[] = {1, 2, 6}; + 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 >= ARRAY_SIZE(formats) * 2/*rates*/ * 3/*layouts*/) + return MF_E_NO_MORE_TYPES; + + if (FAILED(hr = MFCreateMediaType(&output_type))) + return hr; + + subtype = formats[index / 6].subtype; + bps = formats[index / 6].depth; + rate = rates[index % 2]; + channels = channel_cnts[(index / 2) % 3]; + + 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 ? KSAUDIO_SPEAKER_MONO : + channels == 2 ? KSAUDIO_SPEAKER_STEREO : + /*channels == 6*/ KSAUDIO_SPEAKER_5POINT1))) + goto fail; + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE))) + goto fail; + + *type = output_type; + + return S_OK; +fail: + IMFMediaType_Release(output_type); + return hr; } static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)

1 0

Derek Lesho : winegstreamer: Implement ::ProcessMessage for audio conversion MFT.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: c7345a51f7eba396741ccd108b19341834a45382 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7345a51f7eba396741ccd10… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Dec 2 17:36:35 2020 -0500 winegstreamer: Implement ::ProcessMessage for audio conversion MFT. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/audioconvert.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index 8948281fa18..9499920347f 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -326,9 +326,16 @@ static HRESULT WINAPI audio_converter_ProcessEvent(IMFTransform *iface, DWORD id static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) { - FIXME("%p, %u %lu.\n", iface, message, param); + TRACE("%p, %u %lu.\n", iface, message, param); - return E_NOTIMPL; + switch(message) + { + case MFT_MESSAGE_NOTIFY_START_OF_STREAM: + return S_OK; + default: + FIXME("Unhandled message type %x.\n", message); + return E_NOTIMPL; + } } static HRESULT WINAPI audio_converter_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)

1 0

Michael Stefaniuc : urlmon: Use wide-char string literals.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 79181a1d1de92b00b10d42153acbfa9b18858212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79181a1d1de92b00b10d4215… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 3 00:32:46 2020 +0100 urlmon: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/axinstall.c | 37 +++++++------------ dlls/urlmon/bindctx.c | 2 +- dlls/urlmon/binding.c | 13 +++---- dlls/urlmon/bindprot.c | 8 +--- dlls/urlmon/file.c | 3 +- dlls/urlmon/format.c | 2 +- dlls/urlmon/http.c | 9 +---- dlls/urlmon/internet.c | 12 ++---- dlls/urlmon/mimefilter.c | 9 ++--- dlls/urlmon/sec_mgr.c | 93 ++++++++++++++--------------------------------- dlls/urlmon/session.c | 57 +++++++---------------------- dlls/urlmon/umon.c | 8 +--- dlls/urlmon/uri.c | 40 +++++++------------- dlls/urlmon/urlmon_main.c | 4 +- 14 files changed, 89 insertions(+), 208 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=79181a1d1de92b00b10d…

1 0

Jeff Smith : jscript: Use wide-char string literals.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 4d68572aa635094717bd1bdb0165a441f6f8ca2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d68572aa635094717bd1bdb… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Dec 3 00:04:25 2020 -0600 jscript: Use wide-char string literals. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/decode.c | 12 ++++++------ dlls/jscript/function.c | 19 +++++++++---------- dlls/jscript/jsutils.c | 6 +++--- dlls/jscript/parser.y | 4 +--- dlls/jscript/string.c | 4 +--- 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/decode.c b/dlls/jscript/decode.c index 283aa2ed947..6a87d55e0e0 100644 --- a/dlls/jscript/decode.c +++ b/dlls/jscript/decode.c @@ -113,14 +113,14 @@ HRESULT decode_source(WCHAR *code) const WCHAR *src = code; WCHAR *dst = code; - static const WCHAR decode_beginW[] = {'#','@','~','^'}; - static const WCHAR decode_endW[] = {'^','#','~','@'}; + static const WCHAR decode_beginW[] = L"#@~^"; + static const WCHAR decode_endW[] = L"^#~@"; while(*src) { - if(!wcsncmp(src, decode_beginW, ARRAY_SIZE(decode_beginW))) { + if(!wcsncmp(src, decode_beginW, ARRAY_SIZE(decode_beginW)-1)) { DWORD len, i, j=0, csum, s=0; - src += ARRAY_SIZE(decode_beginW); + src += ARRAY_SIZE(decode_beginW) - 1; if(!decode_dword(src, &len)) return JS_E_INVALID_CHAR; @@ -165,9 +165,9 @@ HRESULT decode_source(WCHAR *code) return JS_E_INVALID_CHAR; src += 8; - if(wcsncmp(src, decode_endW, ARRAY_SIZE(decode_endW))) + if(wcsncmp(src, decode_endW, ARRAY_SIZE(decode_endW)-1)) return JS_E_INVALID_CHAR; - src += ARRAY_SIZE(decode_endW); + src += ARRAY_SIZE(decode_endW) - 1; }else { *dst++ = *src++; } diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 9f6aa4b4ec6..7a6dd4b61f3 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -620,17 +620,16 @@ static HRESULT NativeFunction_toString(FunctionInstance *func, jsstr_t **ret) 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_prefixW[] = L"\nfunction "; + static const WCHAR native_suffixW[] = L"() {\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 = jsstr_alloc_buf(ARRAY_SIZE(native_prefixW) + ARRAY_SIZE(native_suffixW) + name_len - 2, &ptr); if(!str) return E_OUTOFMEMORY; memcpy(ptr, native_prefixW, sizeof(native_prefixW)); - ptr += ARRAY_SIZE(native_prefixW); + ptr += ARRAY_SIZE(native_prefixW) - 1; memcpy(ptr, function->name, name_len*sizeof(WCHAR)); ptr += name_len; memcpy(ptr, native_suffixW, sizeof(native_suffixW)); @@ -912,8 +911,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 +931,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 += ARRAY_SIZE(function_anonymousW) + ARRAY_SIZE(function_beginW) + ARRAY_SIZE(function_endW) - 2; str = heap_alloc(len*sizeof(WCHAR)); if(str) { memcpy(str, function_anonymousW, sizeof(function_anonymousW)); - ptr = str + ARRAY_SIZE(function_anonymousW); + ptr = str + ARRAY_SIZE(function_anonymousW) - 1; if(argc > 1) { while(1) { ptr += jsstr_flush(params[j], ptr); @@ -947,7 +946,7 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg } } memcpy(ptr, function_beginW, sizeof(function_beginW)); - ptr += ARRAY_SIZE(function_beginW); + ptr += ARRAY_SIZE(function_beginW) - 1; if(argc) ptr += jsstr_flush(params[argc-1], ptr); memcpy(ptr, function_endW, sizeof(function_endW)); diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 56e8306ba21..a2ac53f64b9 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -494,7 +494,7 @@ 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'}; + static const WCHAR infinityW[] = L"Infinity"; ptr = jsstr_flatten(str); if(!ptr) @@ -510,8 +510,8 @@ static HRESULT str_to_number(jsstr_t *str, double *ret) ptr++; } - if(!wcsncmp(ptr, infinityW, ARRAY_SIZE(infinityW))) { - ptr += ARRAY_SIZE(infinityW); + if(!wcsncmp(ptr, infinityW, ARRAY_SIZE(infinityW)-1)) { + ptr += ARRAY_SIZE(infinityW) - 1; 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..a8bd77dc398 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", ARRAY_SIZE(L"undefined")-1); if(FAILED(hres)) break; }

1 0

Jeff Smith : jscript: Clean up date formatting strings with era.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 58c565559bafafb687c38af5ae01d582889e4140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58c565559bafafb687c38af5… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Dec 3 00:04:26 2020 -0600 jscript: Clean up date formatting strings with era. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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)

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from time.c functions.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 40b3361c0a3363633a764984a1079a7c9f1af9d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40b3361c0a3363633a764984… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 3 19:10:50 2020 +0100 msvcrt: Remove MSVCRT_ prefix from time.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 35 +++--- dlls/msvcr100/msvcr100.spec | 96 +++++++------- dlls/msvcr110/msvcr110.spec | 96 +++++++------- dlls/msvcr120/msvcr120.spec | 96 +++++++------- dlls/msvcr70/msvcr70.spec | 64 +++++----- dlls/msvcr71/msvcr71.spec | 63 +++++----- dlls/msvcr80/msvcr80.spec | 96 +++++++------- dlls/msvcr90/msvcr90.spec | 96 +++++++------- dlls/msvcrt/file.c | 3 +- dlls/msvcrt/msvcrt.spec | 117 +++++++++-------- dlls/msvcrt/time.c | 301 +++++++++++++------------------------------- dlls/msvcrtd/msvcrtd.spec | 50 ++++---- dlls/ucrtbase/ucrtbase.spec | 170 ++++++++++++------------- 13 files changed, 598 insertions(+), 685 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=40b3361c0a3363633a76…

1 0

Rémi Bernon : gdi32: Introduce struct unix_face as a ft_face wrapper.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: dbe4462057e861f45cc8bdd06b33794d5085c22c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbe4462057e861f45cc8bdd0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 1 15:54:46 2020 +0100 gdi32: Introduce struct unix_face as a ft_face wrapper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 124 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 91 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1ee02795bed..00334b470c8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1092,65 +1092,123 @@ fail: return NULL; } +struct unix_face +{ + FT_Face ft_face; + BOOL scalable; + UINT num_faces; + WCHAR *family_name; + WCHAR *second_name; +}; + +static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr, DWORD data_size, + UINT face_index, DWORD flags ) +{ + struct unix_face *This; + struct stat st; + int fd; + + TRACE( "unix_name %s, face_index %u, data_ptr %p, data_size %u, flags %#x\n", + unix_name, face_index, data_ptr, data_size, flags ); + + if (unix_name) + { + if ((fd = open( unix_name, O_RDONLY )) == -1) return NULL; + if (fstat( fd, &st ) == -1) + { + close( fd ); + return NULL; + } + data_size = st.st_size; + data_ptr = mmap( NULL, data_size, PROT_READ, MAP_PRIVATE, fd, 0 ); + close( fd ); + if (data_ptr == MAP_FAILED) return NULL; + } + + if (!(This = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This) ))) goto done; + + if (!(This->ft_face = new_ft_face( unix_name, data_ptr, data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ))) + { + RtlFreeHeap( GetProcessHeap(), 0, This ); + This = NULL; + } + else + { + This->scalable = FT_IS_SCALABLE( This->ft_face ); + This->num_faces = This->ft_face->num_faces; + + This->family_name = ft_face_get_family_name( This->ft_face, system_lcid ); + This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); + + /* try to find another secondary name, preferring the lowest langids */ + if (!RtlCompareUnicodeStrings( This->family_name, lstrlenW( This->family_name ), + This->second_name, lstrlenW( This->second_name ), TRUE )) + { + RtlFreeHeap( GetProcessHeap(), 0, This->second_name ); + This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); + if (!RtlCompareUnicodeStrings( This->family_name, lstrlenW( This->family_name ), + This->second_name, lstrlenW( This->second_name ), TRUE )) + { + RtlFreeHeap( GetProcessHeap(), 0, This->second_name ); + This->second_name = NULL; + } + } + } + +done: + if (unix_name) munmap( data_ptr, data_size ); + return This; +} + +static void unix_face_destroy( struct unix_face *This ) +{ + pFT_Done_Face( This->ft_face ); + RtlFreeHeap( GetProcessHeap(), 0, This->second_name ); + RtlFreeHeap( GetProcessHeap(), 0, This->family_name ); + RtlFreeHeap( GetProcessHeap(), 0, This ); +} + static int add_unix_face( const char *unix_name, const WCHAR *file, void *data_ptr, SIZE_T data_size, DWORD face_index, DWORD flags, DWORD *num_faces ) { + struct unix_face *unix_face; struct bitmap_font_size size; FONTSIGNATURE fs; - FT_Face ft_face; - WCHAR *family_name, *second_name, *style_name, *full_name; + WCHAR *style_name, *full_name; int ret; if (num_faces) *num_faces = 0; - if (!(ft_face = new_ft_face( unix_name, data_ptr, data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ))) + if (!(unix_face = unix_face_create( unix_name, data_ptr, data_size, face_index, flags ))) return 0; - if (ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ + if (unix_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ { TRACE("Ignoring %s since its family name begins with a dot\n", debugstr_a(unix_name)); - pFT_Done_Face( ft_face ); + unix_face_destroy( unix_face ); return 0; } - family_name = ft_face_get_family_name( ft_face, system_lcid ); - second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); - style_name = ft_face_get_style_name( ft_face, system_lcid ); - full_name = ft_face_get_full_name( ft_face, system_lcid ); - - /* try to find another secondary name, preferring the lowest langids */ - if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), - second_name, lstrlenW(second_name), TRUE )) - { - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); - if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), - second_name, lstrlenW(second_name), TRUE )) - { - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - second_name = NULL; - } - } + style_name = ft_face_get_style_name( unix_face->ft_face, system_lcid ); + full_name = ft_face_get_full_name( unix_face->ft_face, system_lcid ); - get_fontsig( ft_face, &fs ); - if (!FT_IS_SCALABLE( ft_face )) get_bitmap_size( ft_face, &size ); + get_fontsig( unix_face->ft_face, &fs ); + if (!unix_face->scalable) get_bitmap_size( unix_face->ft_face, &size ); if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); - ret = callback_funcs->add_gdi_face( family_name, second_name, style_name, full_name, file, - data_ptr, data_size, face_index, fs, get_ntm_flags( ft_face ), - get_font_version( ft_face ), flags, - FT_IS_SCALABLE(ft_face) ? NULL : &size ); + ret = callback_funcs->add_gdi_face( unix_face->family_name, unix_face->second_name, style_name, full_name, + file, data_ptr, data_size, face_index, fs, get_ntm_flags( unix_face->ft_face ), + get_font_version( unix_face->ft_face ), flags, + unix_face->scalable ? NULL : &size ); TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", fs.fsCsb[0], fs.fsCsb[1], fs.fsUsb[0], fs.fsUsb[1], fs.fsUsb[2], fs.fsUsb[3]); - RtlFreeHeap( GetProcessHeap(), 0, family_name ); - RtlFreeHeap( GetProcessHeap(), 0, second_name ); RtlFreeHeap( GetProcessHeap(), 0, style_name ); RtlFreeHeap( GetProcessHeap(), 0, full_name ); - if (num_faces) *num_faces = ft_face->num_faces; - pFT_Done_Face( ft_face ); + if (num_faces) *num_faces = unix_face->num_faces; + unix_face_destroy( unix_face ); return ret; }

1 0

Rémi Bernon : gdi32: Store ft_face font props on unix_face.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: dece7fa9eb5a0075d94d623e7e9cef84f95366d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dece7fa9eb5a0075d94d623e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 1 15:54:47 2020 +0100 gdi32: Store ft_face font props on unix_face. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 00334b470c8..cb993034d09 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1099,6 +1099,12 @@ struct unix_face UINT num_faces; WCHAR *family_name; WCHAR *second_name; + WCHAR *style_name; + WCHAR *full_name; + DWORD ntm_flags; + DWORD font_version; + FONTSIGNATURE fs; + struct bitmap_font_size size; }; static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr, DWORD data_size, @@ -1153,6 +1159,14 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This->second_name = NULL; } } + + This->style_name = ft_face_get_style_name( This->ft_face, system_lcid ); + This->full_name = ft_face_get_full_name( This->ft_face, system_lcid ); + + This->ntm_flags = get_ntm_flags( This->ft_face ); + This->font_version = get_font_version( This->ft_face ); + if (!This->scalable) get_bitmap_size( This->ft_face, &This->size ); + get_fontsig( This->ft_face, &This->fs ); } done: @@ -1163,6 +1177,8 @@ done: static void unix_face_destroy( struct unix_face *This ) { pFT_Done_Face( This->ft_face ); + RtlFreeHeap( GetProcessHeap(), 0, This->full_name ); + RtlFreeHeap( GetProcessHeap(), 0, This->style_name ); RtlFreeHeap( GetProcessHeap(), 0, This->second_name ); RtlFreeHeap( GetProcessHeap(), 0, This->family_name ); RtlFreeHeap( GetProcessHeap(), 0, This ); @@ -1172,9 +1188,6 @@ static int add_unix_face( const char *unix_name, const WCHAR *file, void *data_p DWORD face_index, DWORD flags, DWORD *num_faces ) { struct unix_face *unix_face; - struct bitmap_font_size size; - FONTSIGNATURE fs; - WCHAR *style_name, *full_name; int ret; if (num_faces) *num_faces = 0; @@ -1189,23 +1202,14 @@ static int add_unix_face( const char *unix_name, const WCHAR *file, void *data_p return 0; } - style_name = ft_face_get_style_name( unix_face->ft_face, system_lcid ); - full_name = ft_face_get_full_name( unix_face->ft_face, system_lcid ); - - get_fontsig( unix_face->ft_face, &fs ); - if (!unix_face->scalable) get_bitmap_size( unix_face->ft_face, &size ); if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); - ret = callback_funcs->add_gdi_face( unix_face->family_name, unix_face->second_name, style_name, full_name, - file, data_ptr, data_size, face_index, fs, get_ntm_flags( unix_face->ft_face ), - get_font_version( unix_face->ft_face ), flags, - unix_face->scalable ? NULL : &size ); + ret = callback_funcs->add_gdi_face( unix_face->family_name, unix_face->second_name, unix_face->style_name, unix_face->full_name, + file, data_ptr, data_size, face_index, unix_face->fs, unix_face->ntm_flags, + unix_face->font_version, flags, unix_face->scalable ? NULL : &unix_face->size ); - TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", - fs.fsCsb[0], fs.fsCsb[1], fs.fsUsb[0], fs.fsUsb[1], fs.fsUsb[2], fs.fsUsb[3]); - - RtlFreeHeap( GetProcessHeap(), 0, style_name ); - RtlFreeHeap( GetProcessHeap(), 0, full_name ); + TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", unix_face->fs.fsCsb[0], unix_face->fs.fsCsb[1], + unix_face->fs.fsUsb[0], unix_face->fs.fsUsb[1], unix_face->fs.fsUsb[2], unix_face->fs.fsUsb[3]); if (num_faces) *num_faces = unix_face->num_faces; unix_face_destroy( unix_face );

1 0