wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Alexandre Julliard : kernelbase: Reimplement GetTimeFormatA().
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: dc37b66d1743cf88bc5ac49ea05c6adb914626ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc37b66d1743cf88bc5ac49e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 4 08:56:25 2022 +0200 kernelbase: Reimplement GetTimeFormatA(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/lcformat.c | 779 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/locale.c | 29 ++ 5 files changed, 31 insertions(+), 782 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc37b66d1743cf88bc5a…

1 0

Alexandre Julliard : kernelbase: Reimplement GetDateFormatA().
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: fc26407e8eb5016627cd238f4ff562732d5aeb0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc26407e8eb5016627cd238f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 4 08:55:45 2022 +0200 kernelbase: Reimplement GetDateFormatA(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/lcformat.c | 53 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/locale.c | 29 ++++++++++++++++++++++ 4 files changed, 31 insertions(+), 55 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ebe5559d615..bc292f62faa 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -640,7 +640,7 @@ @ stdcall -norelay GetCurrentThreadId() KERNEL32_GetCurrentThreadId @ stdcall -import GetCurrentThreadStackLimits(ptr ptr) @ stdcall -arch=x86_64 GetCurrentUmsThread() -@ stdcall GetDateFormatA(long long ptr str ptr long) +@ stdcall -import GetDateFormatA(long long ptr str ptr long) @ stdcall -import GetDateFormatEx(wstr long ptr wstr ptr long wstr) @ stdcall -import GetDateFormatW(long long ptr wstr ptr long) @ stdcall GetDaylightFlag() diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 21d14328449..8cadaf42246 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -727,59 +727,6 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags, return iRet; } -/****************************************************************************** - * GetDateFormatA [KERNEL32.@] - * - * Format a date for a given locale. - * - * PARAMS - * lcid [I] Locale to format for - * dwFlags [I] LOCALE_ and DATE_ flags from "winnls.h" - * lpTime [I] Date to format - * lpFormat [I] Format string, or NULL to use the system defaults - * lpDateStr [O] Destination for formatted string - * cchOut [I] Size of lpDateStr, or 0 to calculate the resulting size - * - * NOTES - * - If lpFormat is NULL, lpDateStr will be formatted according to the format - * details returned by GetLocaleInfoA() and modified by dwFlags. - * - lpFormat is a string of characters and formatting tokens. Any characters - * in the string are copied verbatim to lpDateStr, with tokens being replaced - * by the date values they represent. - * - The following tokens have special meanings in a date format string: - *| Token Meaning - *| ----- ------- - *| d Single digit day of the month (no leading 0) - *| dd Double digit day of the month - *| ddd Short name for the day of the week - *| dddd Long name for the day of the week - *| M Single digit month of the year (no leading 0) - *| MM Double digit month of the year - *| MMM Short name for the month of the year - *| MMMM Long name for the month of the year - *| y Double digit year number (no leading 0) - *| yy Double digit year number - *| yyyy Four digit year number - *| gg Era string, for example 'AD'. - * - To output any literal character that could be misidentified as a token, - * enclose it in single quotes. - * - The ANSI version of this function fails if lcid is Unicode only. - * - * RETURNS - * Success: The number of character written to lpDateStr, or that would - * have been written, if cchOut is 0. - * Failure: 0. Use GetLastError() to determine the cause. - */ -INT WINAPI GetDateFormatA( LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, - LPCSTR lpFormat, LPSTR lpDateStr, INT cchOut) -{ - TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime, - debugstr_a(lpFormat), lpDateStr, cchOut); - - return NLS_GetDateTimeFormatA(lcid, dwFlags | DATE_DATEVARSONLY, lpTime, - lpFormat, lpDateStr, cchOut); -} - /****************************************************************************** * GetTimeFormatA [KERNEL32.@] * diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 06744a79b1f..2ca7a036916 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -499,7 +499,7 @@ @ stdcall -norelay GetCurrentThread() kernelbase_GetCurrentThread @ stdcall -norelay GetCurrentThreadId() kernelbase_GetCurrentThreadId @ stdcall GetCurrentThreadStackLimits(ptr ptr) -@ stdcall GetDateFormatA(long long ptr str ptr long) kernel32.GetDateFormatA +@ stdcall GetDateFormatA(long long ptr str ptr long) @ stdcall GetDateFormatEx(wstr long ptr wstr ptr long wstr) @ stdcall GetDateFormatW(long long ptr wstr ptr long) @ stdcall GetDeviceDriverBaseNameA(ptr ptr long) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 01ccd3cc6b6..4057c462b89 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -7158,6 +7158,35 @@ int WINAPI GetCurrencyFormatEx( const WCHAR *name, DWORD flags, const WCHAR *val } +/****************************************************************************** + * GetDateFormatA (KERNEL32.@) + */ +int WINAPI GetDateFormatA( LCID lcid, DWORD flags, const SYSTEMTIME *time, + const char *format, char *buffer, int len ) +{ + UINT cp = get_lcid_codepage( lcid, flags ); + WCHAR formatW[128], output[128]; + int ret; + + TRACE( "(0x%04lx,0x%08lx,%p,%s,%p,%d)\n", lcid, flags, time, debugstr_a(format), buffer, len ); + + if (len < 0 || (len && !buffer)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (format) + { + MultiByteToWideChar( cp, 0, format, -1, formatW, ARRAY_SIZE(formatW) ); + ret = GetDateFormatW( lcid, flags, time, formatW, output, ARRAY_SIZE(output) ); + } + else ret = GetDateFormatW( lcid, flags, time, NULL, output, ARRAY_SIZE(output) ); + + if (ret) ret = WideCharToMultiByte( cp, 0, output, -1, buffer, len, 0, 0 ); + return ret; +} + + /*********************************************************************** * GetDateFormatW (kernelbase.@) */

1 0

Alexandre Julliard : kernelbase: Reimplement GetTimeFormatW/Ex() using get_locale_info().
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: 1b127e24dc89a7b7f728004811016d1b7c4a2028 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b127e24dc89a7b7f7280048… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 4 08:52:08 2022 +0200 kernelbase: Reimplement GetTimeFormatW/Ex() using get_locale_info(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/lcformat.c | 47 ------------ dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/locale.c | 153 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 51 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7067dff6b25..ebe5559d615 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -870,8 +870,8 @@ @ stdcall GetTickCount() @ stdcall -ret64 GetTickCount64() @ stdcall GetTimeFormatA(long long ptr str ptr long) -@ stdcall GetTimeFormatEx(wstr long ptr wstr ptr long) -@ stdcall GetTimeFormatW(long long ptr wstr ptr long) +@ stdcall -import GetTimeFormatEx(wstr long ptr wstr ptr long) +@ stdcall -import GetTimeFormatW(long long ptr wstr ptr long) @ stdcall -import GetTimeZoneInformation(ptr) @ stdcall -import GetTimeZoneInformationForYear(long ptr ptr) # @ stub GetUILanguageInfo diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index dbe960abec4..21d14328449 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -830,50 +830,3 @@ INT WINAPI GetTimeFormatA(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, return NLS_GetDateTimeFormatA(lcid, dwFlags|TIME_TIMEVARSONLY, lpTime, lpFormat, lpTimeStr, cchOut); } - -/****************************************************************************** - * GetTimeFormatEx [KERNEL32.@] - * - * Format a date for a given locale. - * - * PARAMS - * localename [I] Locale to format for - * flags [I] LOCALE_ and TIME_ flags from "winnls.h" - * time [I] Time to format - * format [I] Formatting overrides - * outbuf [O] Destination for formatted string - * bufsize [I] Size of outbuf, or 0 to calculate the resulting size - * - * See GetTimeFormatA for notes. - * - * RETURNS - * Success: The number of characters written to outbuf, or that would have - * have been written if bufsize is 0. - * Failure: 0. Use GetLastError() to determine the cause. - */ -INT WINAPI GetTimeFormatEx(LPCWSTR localename, DWORD flags, - const SYSTEMTIME* time, LPCWSTR format, - LPWSTR outbuf, INT bufsize) -{ - TRACE("(%s,0x%08lx,%p,%s,%p,%d)\n", debugstr_w(localename), flags, time, - debugstr_w(format), outbuf, bufsize); - - return NLS_GetDateTimeFormatW(LocaleNameToLCID(localename, 0), - flags | TIME_TIMEVARSONLY, time, format, - outbuf, bufsize); -} - -/****************************************************************************** - * GetTimeFormatW [KERNEL32.@] - * - * See GetTimeFormatA. - */ -INT WINAPI GetTimeFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, - LPCWSTR lpFormat, LPWSTR lpTimeStr, INT cchOut) -{ - TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime, - debugstr_w(lpFormat), lpTimeStr, cchOut); - - return NLS_GetDateTimeFormatW(lcid, dwFlags|TIME_TIMEVARSONLY, lpTime, - lpFormat, lpTimeStr, cchOut); -} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 103054ed636..06744a79b1f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -756,8 +756,8 @@ @ stdcall GetTickCount() @ stdcall -ret64 GetTickCount64() @ stdcall GetTimeFormatA(long long ptr str ptr long) kernel32.GetTimeFormatA -@ stdcall GetTimeFormatEx(wstr long ptr wstr ptr long) kernel32.GetTimeFormatEx -@ stdcall GetTimeFormatW(long long ptr wstr ptr long) kernel32.GetTimeFormatW +@ stdcall GetTimeFormatEx(wstr long ptr wstr ptr long) +@ stdcall GetTimeFormatW(long long ptr wstr ptr long) @ stdcall GetTimeZoneInformation(ptr) @ stdcall GetTimeZoneInformationForYear(long ptr ptr) @ stdcall GetTokenInformation(long long ptr long ptr) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2f9fd8eaf4a..01ccd3cc6b6 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -6966,6 +6966,120 @@ static int get_date_format( const NLS_LOCALE_DATA *locale, DWORD flags, const SY } +static int get_time_format( const NLS_LOCALE_DATA *locale, DWORD flags, const SYSTEMTIME *systime, + const WCHAR *format, WCHAR *buffer, int len ) +{ + DWORD override = flags & LOCALE_NOUSEROVERRIDE; + WCHAR *p, *last, fmt[80], output[256]; + SYSTEMTIME time; + int i, ret, val, count; + BOOL skip = FALSE; + + if (!format) + { + get_locale_info( locale, 0, LOCALE_STIMEFORMAT | override, fmt, ARRAY_SIZE(fmt) ); + format = fmt; + } + else if (override) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + + if (systime) + { + time = *systime; + if (time.wMilliseconds > 999 || time.wSecond > 59 || time.wMinute > 59 || time.wHour > 23) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + } + else GetLocalTime( &time ); + + for (p = last = output; *format; format += count) + { + count = get_pattern_len( format, L"Hhmst" ); + + switch (*format) + { + case '\'': + for (i = 1; i < count; i++) + { + if (format[i] == '\'') i++; + if (!skip && i < count) *p++ = format[i]; + } + continue; + + case 'H': + val = time.wHour; + break; + + case 'h': + val = time.wHour; + if (!(flags & TIME_FORCE24HOURFORMAT)) + { + val %= 12; + if (!val) val = 12; + } + break; + + case 'm': + if (flags & TIME_NOMINUTESORSECONDS) + { + p = last; + skip = TRUE; + continue; + } + val = time.wMinute; + break; + + case 's': + if (flags & (TIME_NOMINUTESORSECONDS | TIME_NOSECONDS)) + { + p = last; + skip = TRUE; + continue; + } + val = time.wSecond; + break; + + case 't': + if (flags & TIME_NOTIMEMARKER) + { + p = last; + skip = TRUE; + continue; + } + val = time.wHour < 12 ? LOCALE_S1159 : LOCALE_S2359; + ret = get_locale_info( locale, 0, val | override, p, output + ARRAY_SIZE(output) - p ); + p += (count > 1) ? ret - 1 : 1; + skip = FALSE; + continue; + + default: + if (!skip || *format == ' ') *p++ = *format; + continue; + } + + p += swprintf( p, output + ARRAY_SIZE(output) - p, L"%.*u", min( 2, count ), val ); + last = p; + skip = FALSE; + } + *p++ = 0; + ret = p - output; + + if (!len) return ret; + lstrcpynW( buffer, output, len ); + if (ret > len) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + return ret; +} + + /************************************************************************** * GetNumberFormatW (kernelbase.@) */ @@ -7081,3 +7195,42 @@ int WINAPI GetDateFormatEx( const WCHAR *name, DWORD flags, const SYSTEMTIME *sy TRACE( "(%s,%lx,%p,%s,%p,%d)\n", debugstr_w(name), flags, systime, debugstr_w(format), buffer, len ); return get_date_format( locale, flags, systime, format, buffer, len ); } + + +/*********************************************************************** + * GetTimeFormatW (kernelbase.@) + */ +int WINAPI GetTimeFormatW( LCID lcid, DWORD flags, const SYSTEMTIME *systime, + const WCHAR *format, WCHAR *buffer, int len ) +{ + const NLS_LOCALE_DATA *locale = NlsValidateLocale( &lcid, 0 ); + + if (len < 0 || (len && !buffer) || !locale) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + TRACE( "(%04lx,%lx,%p,%s,%p,%d)\n", lcid, flags, systime, debugstr_w(format), buffer, len ); + return get_time_format( locale, flags, systime, format, buffer, len ); +} + + +/*********************************************************************** + * GetTimeFormatEx (kernelbase.@) + */ +int WINAPI GetTimeFormatEx( const WCHAR *name, DWORD flags, const SYSTEMTIME *systime, + const WCHAR *format, WCHAR *buffer, int len ) +{ + LCID lcid; + const NLS_LOCALE_DATA *locale = get_locale_by_name( name, &lcid ); + + if (len < 0 || (len && !buffer) || !locale) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + TRACE( "(%s,%lx,%p,%s,%p,%d)\n", debugstr_w(name), flags, systime, debugstr_w(format), buffer, len ); + return get_time_format( locale, flags, systime, format, buffer, len ); +}

1 0

Alexandre Julliard : kernelbase: Reimplement GetDateFormatW/Ex() using get_locale_info().
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: 6ccdd7f8f55fe3324bda571c9692a6839c6d6135 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ccdd7f8f55fe3324bda571c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 4 08:44:20 2022 +0200 kernelbase: Reimplement GetDateFormatW/Ex() using get_locale_info(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/lcformat.c | 55 ------------ dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/locale.c | 184 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ccdd7f8f55fe3324bda…

1 0

Zebediah Figura : winegstreamer: Make some wg_format variables static const.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: 2cfcdc64625e36edca686d0e9249b38605bb7ede URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cfcdc64625e36edca686d0e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 16:21:58 2022 -0500 winegstreamer: Make some wg_format variables static const. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/h264_decoder.c | 4 ++-- dlls/winegstreamer/wma_decoder.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index ed990428dec..de823741ba9 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -596,7 +596,7 @@ static const IMFTransformVtbl transform_vtbl = HRESULT h264_decoder_create(REFIID riid, void **ret) { - struct wg_format output_format = + static const struct wg_format output_format = { .major_type = WG_MAJOR_TYPE_VIDEO, .u.video = @@ -606,7 +606,7 @@ HRESULT h264_decoder_create(REFIID riid, void **ret) .height = 1080, }, }; - struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_H264}; + static const struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_H264}; struct wg_transform *transform; struct h264_decoder *decoder; diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index fb20ba7a2ce..71369add244 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -854,7 +854,7 @@ static const IPropertyBagVtbl property_bag_vtbl = HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out) { - struct wg_format output_format = + static const struct wg_format output_format = { .major_type = WG_MAJOR_TYPE_AUDIO, .u.audio = @@ -865,7 +865,7 @@ HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out) .rate = 44100, }, }; - struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_WMA}; + static const struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_WMA}; struct wg_transform *transform; struct wma_decoder *decoder;

1 0

Zebediah Figura : winegstreamer: Print messages relating to missing decoders in the winediag channel.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: a4201aa6dec755ec824a0e8bb301ce2154e54ec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4201aa6dec755ec824a0e8b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 16:21:57 2022 -0500 winegstreamer: Print messages relating to missing decoders in the winediag channel. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/h264_decoder.c | 3 ++- dlls/winegstreamer/wma_decoder.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index b98f137eb82..ed990428dec 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -27,6 +27,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static const GUID *const h264_decoder_input_types[] = { @@ -613,7 +614,7 @@ HRESULT h264_decoder_create(REFIID riid, void **ret) if (!(transform = wg_transform_create(&input_format, &output_format))) { - FIXME("GStreamer doesn't support H264 decoding, please install appropriate plugins\n"); + ERR_(winediag)("GStreamer doesn't support H.264 decoding, please install appropriate plugins\n"); return E_FAIL; } wg_transform_destroy(transform); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 24ea176bfc8..fb20ba7a2ce 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -29,6 +29,7 @@ #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmadec); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static const GUID *const wma_decoder_input_types[] = { @@ -872,7 +873,7 @@ HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out) if (!(transform = wg_transform_create(&input_format, &output_format))) { - FIXME("GStreamer doesn't support WMA decoding, please install appropriate plugins\n"); + ERR_(winediag)("GStreamer doesn't support WMA decoding, please install appropriate plugins\n"); return E_FAIL; } wg_transform_destroy(transform);

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Handle loops in copy propagation.
by Alexandre Julliard 04 May '22

04 May '22

Module: vkd3d Branch: master Commit: e6ce077ad48d5140009c4470bd916764b468c172 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e6ce077ad48d5140009c447… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 3 11:57:21 2022 +0200 vkd3d-shader/hlsl: Handle loops in copy propagation. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index b967a2a3..78b22910 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -634,6 +634,21 @@ static bool copy_propagation_process_if(struct hlsl_ctx *ctx, struct hlsl_ir_if return progress; } +static bool copy_propagation_process_loop(struct hlsl_ctx *ctx, struct hlsl_ir_loop *loop, + struct copy_propagation_state *state) +{ + struct copy_propagation_state inner_state; + bool progress = false; + + copy_propagation_invalidate_from_block(ctx, state, &loop->body); + + copy_propagation_state_init(ctx, &inner_state, state); + progress |= copy_propagation_transform_block(ctx, &loop->body, &inner_state); + copy_propagation_state_destroy(&inner_state); + + return progress; +} + static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_block *block, struct copy_propagation_state *state) { @@ -661,8 +676,8 @@ static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_b break; case HLSL_IR_LOOP: - FIXME("Copy propagation doesn't support loops yet, leaving.\n"); - return progress; + progress |= copy_propagation_process_loop(ctx, hlsl_ir_loop(instr), state); + break; default: break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Remove the location parameter from initialize_var_components().
by Alexandre Julliard 04 May '22

04 May '22

Module: vkd3d Branch: master Commit: ec85eb538b372da07fcb028d67c595e6c4f2727e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ec85eb538b372da07fcb028… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 3 11:57:17 2022 +0200 vkd3d-shader/hlsl: Remove the location parameter from initialize_var_components(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e518430f..44e4964f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1536,8 +1536,7 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem } static void initialize_var_components(struct hlsl_ctx *ctx, struct list *instrs, - struct hlsl_ir_var *dst, unsigned int *store_index, struct hlsl_ir_node *src, - const struct vkd3d_shader_location *loc) + struct hlsl_ir_var *dst, unsigned int *store_index, struct hlsl_ir_node *src) { unsigned int src_comp_count = hlsl_type_component_count(src->data_type); unsigned int k; @@ -1554,21 +1553,21 @@ static void initialize_var_components(struct hlsl_ctx *ctx, struct list *instrs, dst_reg_offset = hlsl_compute_component_offset(ctx, dst->data_type, *store_index, &dst_comp_type); src_reg_offset = hlsl_compute_component_offset(ctx, src->data_type, k, &src_comp_type); - if (!(c = hlsl_new_uint_constant(ctx, src_reg_offset, loc))) + if (!(c = hlsl_new_uint_constant(ctx, src_reg_offset, &src->loc))) return; list_add_tail(instrs, &c->node.entry); - if (!(load = add_load(ctx, instrs, src, &c->node, src_comp_type, *loc))) + if (!(load = add_load(ctx, instrs, src, &c->node, src_comp_type, src->loc))) return; - if (!(conv = add_implicit_conversion(ctx, instrs, &load->node, dst_comp_type, loc))) + if (!(conv = add_implicit_conversion(ctx, instrs, &load->node, dst_comp_type, &src->loc))) return; - if (!(c = hlsl_new_uint_constant(ctx, dst_reg_offset, loc))) + if (!(c = hlsl_new_uint_constant(ctx, dst_reg_offset, &src->loc))) return; list_add_tail(instrs, &c->node.entry); - if (!(store = hlsl_new_store(ctx, dst, &c->node, conv, 0, *loc))) + if (!(store = hlsl_new_store(ctx, dst, &c->node, conv, 0, src->loc))) return; list_add_tail(instrs, &store->node.entry); @@ -1716,7 +1715,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t for (k = 0; k < v->initializer.args_count; ++k) { initialize_var_components(ctx, v->initializer.instrs, var, - &store_index, v->initializer.args[k], &v->initializer.args[k]->loc); + &store_index, v->initializer.args[k]); } } else @@ -2049,7 +2048,7 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type continue; } - initialize_var_components(ctx, params->instrs, var, &idx, arg, &arg->loc); + initialize_var_components(ctx, params->instrs, var, &idx, arg); } if (!(load = hlsl_new_var_load(ctx, var, loc)))

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Use a more sensible source location in add_constructor().
by Alexandre Julliard 04 May '22

04 May '22

Module: vkd3d Branch: master Commit: 9ad6ad70653ffa03523929f10a96c0ef9a16ea84 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9ad6ad70653ffa03523929f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 3 11:57:16 2022 +0200 vkd3d-shader/hlsl: Use a more sensible source location in add_constructor(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 905dbfc5..e518430f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2049,7 +2049,7 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type continue; } - initialize_var_components(ctx, params->instrs, var, &idx, arg, &loc); + initialize_var_components(ctx, params->instrs, var, &idx, arg, &arg->loc); } if (!(load = hlsl_new_var_load(ctx, var, loc)))

1 0

Fabian Maurer : shell32: Refactor to keep style consistent.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 16901659588c14b8336e5b2d1a5ace985c72e1f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16901659588c14b8336e5b2d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Apr 26 21:03:20 2022 +0200 shell32: Refactor to keep style consistent. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellitem.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index ada98705483..3e8bd24a429 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1336,16 +1336,13 @@ HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, if(SUCCEEDED(ret)) { ret = create_shellitemarray(array, cidl, ppsiItemArray); - if(SUCCEEDED(ret)) - { - heap_free(array); - return ret; - } } - /* Something failed, clean up. */ - for(i = 0; i < cidl; i++) - if(array[i]) IShellItem_Release(array[i]); + if(FAILED(ret)) + { + for(i = 0; i < cidl; i++) + if(array[i]) IShellItem_Release(array[i]); + } heap_free(array); return ret; }

1 0

← Newer
1
...
73
74
75
76
77
78
79
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022