- Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt: Use the acosf() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: c9399ae7d510c64114a9b650e8d1bc37eb5ac2d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c9399ae7d510c64114a9b650e8d1bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 14:40:21 2023 +0200 msvcrt: Use the acosf() implementation from the bundled musl library. With the changes from 9c8f8e715f4fd3a35924e4e9d32eb42fa8b56a18. --- dlls/msvcrt/math.c | 47 ---------------------------------------------- libs/musl/src/math/acosf.c | 21 +++++++++++---------- 2 files changed, 11 insertions(+), 57 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ca95f51873a..b8a3fae663f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -305,53 +305,6 @@ static float asinf_R(float z) return p / q; } -/********************************************************************* - * acosf (MSVCRT.@) - * - * Copied from musl: src/math/acosf.c - */ -float CDECL acosf( float x ) -{ - static const double pio2_lo = 6.12323399573676603587e-17; - static const double pio2_hi = 1.57079632679489655800e+00; - - float z, w, s, c, df; - unsigned int hx, ix; - - hx = *(unsigned int*)&x; - ix = hx & 0x7fffffff; - /* |x| >= 1 or nan */ - if (ix >= 0x3f800000) { - if (ix == 0x3f800000) { - if (hx >> 31) - return M_PI; - return 0; - } - if (isnan(x)) return x; - return math_error(_DOMAIN, "acosf", x, 0, 0 / (x - x)); - } - /* |x| < 0.5 */ - if (ix < 0x3f000000) { - if (ix <= 0x32800000) /* |x| < 2**-26 */ - return M_PI_2; - return pio2_hi - (x - (pio2_lo - x * asinf_R(x * x))); - } - /* x < -0.5 */ - if (hx >> 31) { - z = (1 + x) * 0.5f; - s = sqrtf(z); - return 2*(pio2_hi - (s + (asinf_R(z) * s - pio2_lo))); - } - /* x > 0.5 */ - z = (1 - x) * 0.5f; - s = sqrtf(z); - hx = *(unsigned int*)&s & 0xffff0000; - df = *(float*)&hx; - c = (z - df * df) / (s + df); - w = asinf_R(z) * s + c; - return 2 * (df + w); -} - /********************************************************************* * asinf (MSVCRT.@) * diff --git a/libs/musl/src/math/acosf.c b/libs/musl/src/math/acosf.c index 0da275bf459..bf37332ab52 100644 --- a/libs/musl/src/math/acosf.c +++ b/libs/musl/src/math/acosf.c @@ -18,15 +18,16 @@ static const float pio2_hi = 1.5707962513e+00, /* 0x3fc90fda */ pio2_lo = 7.5497894159e-08, /* 0x33a22168 */ -pS0 = 1.6666586697e-01, -pS1 = -4.2743422091e-02, -pS2 = -8.6563630030e-03, -qS1 = -7.0662963390e-01; +pS0 = 1.66666672e-01, +pS1 = -5.11644611e-02, +pS2 = -1.21124933e-02, +pS3 = -3.58742251e-03, +qS1 = -7.56982703e-01; static float R(float z) { float_t p, q; - p = z*(pS0+z*(pS1+z*pS2)); + p = z*(pS0+z*(pS1+z*(pS2+z*pS3))); q = 1.0f+z*qS1; return p/q; } @@ -42,23 +43,23 @@ float __cdecl acosf(float x) if (ix >= 0x3f800000) { if (ix == 0x3f800000) { if (hx >> 31) - return 2*pio2_hi + 0x1p-120f; + return M_PI; return 0; } - return 0/(x-x); + if (isnan(x)) return x; + return math_error(_DOMAIN, "acosf", x, 0, 0 / (x - x)); } /* |x| < 0.5 */ if (ix < 0x3f000000) { if (ix <= 0x32800000) /* |x| < 2**-26 */ - return pio2_hi + 0x1p-120f; + return M_PI_2; return pio2_hi - (x - (pio2_lo-x*R(x*x))); } /* x < -0.5 */ if (hx >> 31) { z = (1+x)*0.5f; s = sqrtf(z); - w = R(z)*s-pio2_lo; - return 2*(pio2_hi - (s+w)); + return 2*(pio2_hi - (s + (R(z)*s-pio2_lo))); } /* x > 0.5 */ z = (1-x)*0.5f;

1 0

Alexandre Julliard : msvcrt: Use the asinf() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 472d7ec76db02865294c77bd67f7570b50905e73 URL: https://gitlab.winehq.org/wine/wine/-/commit/472d7ec76db02865294c77bd67f757… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 14:53:07 2023 +0200 msvcrt: Use the asinf() implementation from the bundled musl library. With the changes from 0b8db612713d6a92109396951d6ac53fd23d6039. --- dlls/msvcrt/math.c | 55 ---------------------------------------------- libs/musl/src/math/asinf.c | 26 +++++++++++++--------- 2 files changed, 16 insertions(+), 65 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b8a3fae663f..d8eab014e42 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -290,61 +290,6 @@ int CDECL _isnanf( float num ) return (u.i & 0x7fffffff) > 0x7f800000; } -static float asinf_R(float z) -{ - /* coefficients for R(x^2) */ - static const float p1 = 1.66666672e-01, - p2 = -5.11644611e-02, - p3 = -1.21124933e-02, - p4 = -3.58742251e-03, - q1 = -7.56982703e-01; - - float p, q; - p = z * (p1 + z * (p2 + z * (p3 + z * p4))); - q = 1.0f + z * q1; - return p / q; -} - -/********************************************************************* - * asinf (MSVCRT.@) - * - * Copied from musl: src/math/asinf.c - */ -float CDECL asinf( float x ) -{ - static const double pio2 = 1.570796326794896558e+00; - static const float pio4_hi = 0.785398125648; - static const float pio2_lo = 7.54978941586e-08; - - float s, z, f, c; - unsigned int hx, ix; - - hx = *(unsigned int*)&x; - ix = hx & 0x7fffffff; - if (ix >= 0x3f800000) { /* |x| >= 1 */ - if (ix == 0x3f800000) /* |x| == 1 */ - return x * pio2 + 7.5231638453e-37; /* asin(+-1) = +-pi/2 with inexact */ - if (isnan(x)) return x; - return math_error(_DOMAIN, "asinf", x, 0, 0 / (x - x)); - } - if (ix < 0x3f000000) { /* |x| < 0.5 */ - /* if 0x1p-126 <= |x| < 0x1p-12, avoid raising underflow */ - if (ix < 0x39800000 && ix >= 0x00800000) - return x; - return x + x * asinf_R(x * x); - } - /* 1 > |x| >= 0.5 */ - z = (1 - fabsf(x)) * 0.5f; - s = sqrtf(z); - /* f+c = sqrt(z) */ - *(unsigned int*)&f = *(unsigned int*)&s & 0xffff0000; - c = (z - f * f) / (s + f); - x = pio4_hi - (2 * s * asinf_R(z) - (pio2_lo - 2 * c) - (pio4_hi - 2 * f)); - if (hx >> 31) - return -x; - return x; -} - /********************************************************************* * atanf (MSVCRT.@) * diff --git a/libs/musl/src/math/asinf.c b/libs/musl/src/math/asinf.c index b13f80307a5..d4a312e90a3 100644 --- a/libs/musl/src/math/asinf.c +++ b/libs/musl/src/math/asinf.c @@ -18,24 +18,26 @@ static const double pio2 = 1.570796326794896558e+00; static const float +pio4_hi = 0.785398125648, +pio2_lo = 7.54978941586e-08, /* coefficients for R(x^2) */ -pS0 = 1.6666586697e-01, -pS1 = -4.2743422091e-02, -pS2 = -8.6563630030e-03, -qS1 = -7.0662963390e-01; +pS0 = 1.66666672e-01, +pS1 = -5.11644611e-02, +pS2 = -1.21124933e-02, +pS3 = -3.58742251e-03, +qS1 = -7.56982703e-01; static float R(float z) { float_t p, q; - p = z*(pS0+z*(pS1+z*pS2)); + p = z*(pS0+z*(pS1+z*(pS2+z*pS3))); q = 1.0f+z*qS1; return p/q; } float __cdecl asinf(float x) { - double s; - float z; + float s, z, f, c; uint32_t hx,ix; GET_FLOAT_WORD(hx, x); @@ -43,7 +45,8 @@ float __cdecl asinf(float x) if (ix >= 0x3f800000) { /* |x| >= 1 */ if (ix == 0x3f800000) /* |x| == 1 */ return x*pio2 + 0x1p-120f; /* asin(+-1) = +-pi/2 with inexact */ - return 0/(x-x); /* asin(|x|>1) is NaN */ + if (isnan(x)) return x; + return math_error(_DOMAIN, "asinf", x, 0, 0 / (x - x)); } if (ix < 0x3f000000) { /* |x| < 0.5 */ /* if 0x1p-126 <= |x| < 0x1p-12, avoid raising underflow */ @@ -53,8 +56,11 @@ float __cdecl asinf(float x) } /* 1 > |x| >= 0.5 */ z = (1 - fabsf(x))*0.5f; - s = sqrt(z); - x = pio2 - 2*(s+s*R(z)); + s = sqrtf(z); + /* f+c = sqrt(z) */ + *(unsigned int*)&f = *(unsigned int*)&s & 0xffff0000; + c = (z - f * f) / (s + f); + x = pio4_hi - (2*s*R(z) - (pio2_lo - 2*c) - (pio4_hi - 2*f)); if (hx >> 31) return -x; return x;

1 0

Alexandre Julliard : msvcrt: Use the expf() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 221f891848a5f6107c548133418af4583a5db8ec URL: https://gitlab.winehq.org/wine/wine/-/commit/221f891848a5f6107c548133418af4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 30 18:24:56 2023 +0200 msvcrt: Use the expf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 64 ----------------------------------------------- libs/musl/src/math/expf.c | 15 +++-------- 2 files changed, 4 insertions(+), 75 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b1cdb6efb64..ca95f51873a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -218,19 +218,6 @@ float CDECL _chgsignf( float num ) #endif -#ifndef __i386__ -static const UINT64 exp2f_T[] = { - 0x3ff0000000000000ULL, 0x3fefd9b0d3158574ULL, 0x3fefb5586cf9890fULL, 0x3fef9301d0125b51ULL, - 0x3fef72b83c7d517bULL, 0x3fef54873168b9aaULL, 0x3fef387a6e756238ULL, 0x3fef1e9df51fdee1ULL, - 0x3fef06fe0a31b715ULL, 0x3feef1a7373aa9cbULL, 0x3feedea64c123422ULL, 0x3feece086061892dULL, - 0x3feebfdad5362a27ULL, 0x3feeb42b569d4f82ULL, 0x3feeab07dd485429ULL, 0x3feea47eb03a5585ULL, - 0x3feea09e667f3bcdULL, 0x3fee9f75e8ec5f74ULL, 0x3feea11473eb0187ULL, 0x3feea589994cce13ULL, - 0x3feeace5422aa0dbULL, 0x3feeb737b0cdc5e5ULL, 0x3feec49182a3f090ULL, 0x3feed503b23e255dULL, - 0x3feee89f995ad3adULL, 0x3feeff76f2fb5e47ULL, 0x3fef199bdd85529cULL, 0x3fef3720dcef9069ULL, - 0x3fef5818dcfba487ULL, 0x3fef7c97337b9b5fULL, 0x3fefa4afa2a490daULL, 0x3fefd0765b6e4540ULL -}; -#endif - /********************************************************************* * _fdclass (MSVCR120.@) * @@ -489,57 +476,6 @@ float CDECL atanf( float x ) return sign ? -z : z; } -/********************************************************************* - * expf (MSVCRT.@) - */ -float CDECL expf( float x ) -{ - static const double C[] = { - 0x1.c6af84b912394p-5 / (1 << 5) / (1 << 5) / (1 << 5), - 0x1.ebfce50fac4f3p-3 / (1 << 5) / (1 << 5), - 0x1.62e42ff0c52d6p-1 / (1 << 5) - }; - static const double invln2n = 0x1.71547652b82fep+0 * (1 << 5); - - double kd, z, r, r2, y, s; - UINT32 abstop; - UINT64 ki, t; - - abstop = (*(UINT32*)&x >> 20) & 0x7ff; - if (abstop >= 0x42b) { - /* |x| >= 88 or x is nan. */ - if (*(UINT32*)&x == 0xff800000) - return 0.0f; - if (abstop >= 0x7f8) - return x + x; - if (x > 0x1.62e42ep6f) /* x > log(0x1p128) ~= 88.72 */ - return math_error(_OVERFLOW, "expf", x, 0, x * FLT_MAX); - if (x < -0x1.9fe368p6f) /* x < log(0x1p-150) ~= -103.97 */ - return math_error(_UNDERFLOW, "expf", x, 0, fp_barrierf(FLT_MIN) * FLT_MIN); - } - - /* x*N/Ln2 = k + r with r in [-1/2, 1/2] and int k. */ - z = invln2n * x; - - /* Round and convert z to int, the result is in [-150*N, 128*N] and - ideally ties-to-even rule is used, otherwise the magnitude of r - can be bigger which gives larger approximation error. */ - kd = round(z); - ki = (INT64)kd; - r = z - kd; - - /* exp(x) = 2^(k/N) * 2^(r/N) ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */ - t = exp2f_T[ki % (1 << 5)]; - t += ki << (52 - 5); - s = *(double*)&t; - z = C[0] * r + C[1]; - r2 = r * r; - y = C[2] * r + 1; - y = z * r2 + y; - y = y * s; - return y; -} - static BOOL sqrtf_validate( float *x ) { short c = _fdclass(*x); diff --git a/libs/musl/src/math/expf.c b/libs/musl/src/math/expf.c index 6cf118b119e..ee40977baaa 100644 --- a/libs/musl/src/math/expf.c +++ b/libs/musl/src/math/expf.c @@ -45,9 +45,9 @@ float __cdecl expf(float x) if (abstop >= top12(INFINITY)) return x + x; if (x > 0x1.62e42ep6f) /* x > log(0x1p128) ~= 88.72 */ - return __math_oflowf(0); + return math_error(_OVERFLOW, "expf", x, 0, x * FLT_MAX); if (x < -0x1.9fe368p6f) /* x < log(0x1p-150) ~= -103.97 */ - return __math_uflowf(0); + return math_error(_UNDERFLOW, "expf", x, 0, fp_barrierf(FLT_MIN) * FLT_MIN); } /* x*N/Ln2 = k + r with r in [-1/2, 1/2] and int k. */ @@ -56,15 +56,8 @@ float __cdecl expf(float x) /* Round and convert z to int, the result is in [-150*N, 128*N] and ideally ties-to-even rule is used, otherwise the magnitude of r can be bigger which gives larger approximation error. */ -#if TOINT_INTRINSICS - kd = roundtoint(z); - ki = converttoint(z); -#else -# define SHIFT __exp2f_data.shift - kd = eval_as_double(z + SHIFT); - ki = asuint64(kd); - kd -= SHIFT; -#endif + kd = round(z); + ki = (int64_t)kd; r = z - kd; /* exp(x) = 2^(k/N) * 2^(r/N) ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */

1 0

Jactry Zeng : shell32: Assign a default flags for view information of IShellView.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: c26fd2621c762c967ebe5c46261b784bb7d7cdda URL: https://gitlab.winehq.org/wine/wine/-/commit/c26fd2621c762c967ebe5c46261b78… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Apr 8 09:59:03 2023 -0500 shell32: Assign a default flags for view information of IShellView. --- dlls/shell32/shlview.c | 1 + dlls/shell32/tests/shlview.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index f2e8bc67267..da60283393c 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3780,6 +3780,7 @@ IShellView *IShellView_Constructor(IShellFolder *folder) sv->ptLastMousePos.x = 0; sv->ptLastMousePos.y = 0; sv->FolderSettings.ViewMode = FVM_TILE; + sv->FolderSettings.fFlags = FWF_USESEARCHFOLDER; TRACE("(%p)->(%p)\n", sv, folder); return (IShellView*)&sv->IShellView3_iface; diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 71b04367398..0f6ad9f4158 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1504,7 +1504,7 @@ static void test_folder_flags(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(settings.ViewMode == FVM_TILE || broken(!settings.ViewMode) /* pre win7 */, "Got view mode %u.\n", settings.ViewMode); - todo_wine ok(settings.fFlags == FWF_USESEARCHFOLDER || broken(!settings.fFlags) /* pre vista */, + ok(settings.fFlags == FWF_USESEARCHFOLDER || broken(!settings.fFlags) /* pre vista */, "Got flags %#x.\n", settings.fFlags); destroy_interfaces(desktop, shellview);

1 0

Jactry Zeng : shell32: Assign a default view mode value for IShellView.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: e5c3a111c5045610a4509e2ef3a8151f179cd510 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5c3a111c5045610a4509e2ef3a815… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Apr 8 09:51:02 2023 -0500 shell32: Assign a default view mode value for IShellView. --- dlls/shell32/shlview.c | 1 + dlls/shell32/tests/shlview.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 40a7d76c359..f2e8bc67267 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3779,6 +3779,7 @@ IShellView *IShellView_Constructor(IShellFolder *folder) sv->cScrollDelay = 0; sv->ptLastMousePos.x = 0; sv->ptLastMousePos.y = 0; + sv->FolderSettings.ViewMode = FVM_TILE; TRACE("(%p)->(%p)\n", sv, folder); return (IShellView*)&sv->IShellView3_iface; diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index a83f3137509..d25d626f829 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1094,14 +1094,20 @@ static void test_GetSetCurrentViewMode(void) hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&sview); ok(hr == S_OK, "got (0x%08lx)\n", hr); + hr = IShellView_QueryInterface(sview, &IID_IFolderView, (void **)&fview); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + viewmode = 0xdeadbeef; + hr = IFolderView_GetCurrentViewMode(fview, &viewmode); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(viewmode == FVM_TILE || broken(viewmode == 0) /* pre win7 */, "Got view mode %u.\n", viewmode); + fs.ViewMode = 1; fs.fFlags = 0; browser = IShellBrowserImpl_Construct(); hr = IShellView_CreateViewWindow(sview, NULL, &fs, browser, &rc, &hwnd); ok(hr == S_OK || broken(hr == S_FALSE /*Win2k*/ ), "got (0x%08lx)\n", hr); - hr = IShellView_QueryInterface(sview, &IID_IFolderView, (void**)&fview); - ok(hr == S_OK || broken(hr == E_NOINTERFACE), "got (0x%08lx)\n", hr); if(SUCCEEDED(hr)) { HWND hwnd_lv;

1 0

Jactry Zeng : shell32/tests: Add tests for IShellView_GetCurrentInfo().
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: b659fd28ef60639a471267487d110d2f939c6ad8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b659fd28ef60639a471267487d110d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Apr 8 09:58:39 2023 -0500 shell32/tests: Add tests for IShellView_GetCurrentInfo(). --- dlls/shell32/tests/shlview.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 9f85ba0459d..71b04367398 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1491,6 +1491,25 @@ static void test_newmenu(void) IUnknown_Release(unk); } +static void test_folder_flags(void) +{ + FOLDERSETTINGS settings; + IShellFolder *desktop; + IShellView *shellview; + HRESULT hr; + + create_interfaces(&desktop, &shellview); + + hr = IShellView_GetCurrentInfo(shellview, &settings); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(settings.ViewMode == FVM_TILE || broken(!settings.ViewMode) /* pre win7 */, + "Got view mode %u.\n", settings.ViewMode); + todo_wine ok(settings.fFlags == FWF_USESEARCHFOLDER || broken(!settings.fFlags) /* pre vista */, + "Got flags %#x.\n", settings.fFlags); + + destroy_interfaces(desktop, shellview); +} + START_TEST(shlview) { OleInitialize(NULL); @@ -1507,6 +1526,7 @@ START_TEST(shlview) test_SHCreateShellFolderView(); test_SHCreateShellFolderViewEx(); test_newmenu(); + test_folder_flags(); OleUninitialize(); }

1 0

Paul Gofman : winegstreamer: Provide samples if DXGI device manager is set in h264 decoder.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: a208589b2732f852d741b14b920714fba390c952 URL: https://gitlab.winehq.org/wine/wine/-/commit/a208589b2732f852d741b14b920714… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 31 20:08:19 2023 -0600 winegstreamer: Provide samples if DXGI device manager is set in h264 decoder. --- dlls/mf/tests/transform.c | 3 +- dlls/winegstreamer/h264_decoder.c | 63 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 5 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 26052e6ea6e..b41f87afabe 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -6867,8 +6867,7 @@ static void test_h264_with_dxgi_manager(void) status = 0; memset(output, 0, sizeof(output)); hr = IMFTransform_ProcessOutput(transform, 0, 1, output, &status); - todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "got %#lx\n", hr); - if (hr != MF_E_TRANSFORM_NEED_MORE_INPUT) goto failed; + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "got %#lx\n", hr); hr = IMFTransform_GetAttributes(transform, &attribs); ok(hr == S_OK, "got %#lx\n", hr); diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index e92d7bd730b..00c6afd96cd 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -63,6 +63,7 @@ struct h264_decoder struct wg_sample_queue *wg_sample_queue; IMFVideoSampleAllocatorEx *allocator; + BOOL allocator_initialized; }; static struct h264_decoder *impl_from_IMFTransform(IMFTransform *iface) @@ -204,6 +205,26 @@ static HRESULT fill_output_media_type(struct h264_decoder *decoder, IMFMediaType return S_OK; } +static HRESULT init_allocator(struct h264_decoder *decoder) +{ + HRESULT hr; + + if (decoder->allocator_initialized) + return S_OK; + + if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(decoder->allocator, 10, 10, + decoder->attributes, decoder->output_type))) + return hr; + decoder->allocator_initialized = TRUE; + return S_OK; +} + +static void uninit_allocator(struct h264_decoder *decoder) +{ + IMFVideoSampleAllocatorEx_UninitializeSampleAllocator(decoder->allocator); + decoder->allocator_initialized = FALSE; +} + static HRESULT WINAPI transform_QueryInterface(IMFTransform *iface, REFIID iid, void **out) { struct h264_decoder *decoder = impl_from_IMFTransform(iface); @@ -583,11 +604,22 @@ static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFM static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) { struct h264_decoder *decoder = impl_from_IMFTransform(iface); + HRESULT hr; TRACE("iface %p, message %#x, param %Ix.\n", iface, message, param); if (message == MFT_MESSAGE_SET_D3D_MANAGER) - return IMFVideoSampleAllocatorEx_SetDirectXManager(decoder->allocator, (IUnknown *)param); + { + if (FAILED(hr = IMFVideoSampleAllocatorEx_SetDirectXManager(decoder->allocator, (IUnknown *)param))) + return hr; + + uninit_allocator(decoder); + if (param) + decoder->output_info.dwFlags |= MFT_OUTPUT_STREAM_PROVIDES_SAMPLES; + else + decoder->output_info.dwFlags &= ~MFT_OUTPUT_STREAM_PROVIDES_SAMPLES; + return S_OK; + } FIXME("Ignoring message %#x.\n", message); return S_OK; @@ -611,6 +643,7 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, struct h264_decoder *decoder = impl_from_IMFTransform(iface); struct wg_format wg_format; UINT32 sample_size; + IMFSample *sample; UINT64 frame_rate; GUID subtype; HRESULT hr; @@ -624,7 +657,7 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, return MF_E_TRANSFORM_TYPE_NOT_SET; *status = samples->dwStatus = 0; - if (!samples->pSample) + if (!(sample = samples->pSample) && !(decoder->output_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES)) return E_INVALIDARG; if (FAILED(hr = IMFMediaType_GetGUID(decoder->output_type, &MF_MT_SUBTYPE, &subtype))) @@ -633,7 +666,21 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, decoder->wg_format.u.video.height, &sample_size))) return hr; - if (SUCCEEDED(hr = wg_transform_read_mf(decoder->wg_transform, samples->pSample, + if (decoder->output_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES) + { + if (FAILED(hr = init_allocator(decoder))) + { + ERR("Failed to initialize allocator, hr %#lx.\n", hr); + return hr; + } + if (FAILED(hr = IMFVideoSampleAllocatorEx_AllocateSample(decoder->allocator, &sample))) + { + ERR("Failed to allocate sample, hr %#lx.\n", hr); + return hr; + } + } + + if (SUCCEEDED(hr = wg_transform_read_mf(decoder->wg_transform, sample, sample_size, &wg_format, &samples->dwStatus))) wg_sample_queue_flush(decoder->wg_sample_queue, false); @@ -652,6 +699,16 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; *status |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; + + uninit_allocator(decoder); + } + + if (decoder->output_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES) + { + if (hr == S_OK) + samples->pSample = sample; + else + IMFSample_Release(sample); } return hr;

1 0

Paul Gofman : winegstreamer: Pass temporary sample to wg_transform_read_mf() in h264 decoder.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 17c86f42de494620efb133ab471bb1b0b8ef9d0d URL: https://gitlab.winehq.org/wine/wine/-/commit/17c86f42de494620efb133ab471bb1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Apr 4 18:14:48 2023 -0600 winegstreamer: Pass temporary sample to wg_transform_read_mf() in h264 decoder. --- dlls/winegstreamer/Makefile.in | 2 +- dlls/winegstreamer/h264_decoder.c | 69 ++++++++++++++++++++++++++++++++++----- 2 files changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 82b1c148d6b..ae6420bad84 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -2,7 +2,7 @@ MODULE = winegstreamer.dll UNIXLIB = winegstreamer.so IMPORTLIB = winegstreamer IMPORTS = strmbase ole32 oleaut32 msdmo -DELAYIMPORTS = mfplat +DELAYIMPORTS = mfplat mf UNIX_CFLAGS = $(GSTREAMER_CFLAGS) UNIX_LIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 00c6afd96cd..1e18aff2635 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -64,6 +64,8 @@ struct h264_decoder IMFVideoSampleAllocatorEx *allocator; BOOL allocator_initialized; + IMFTransform *copier; + IMFMediaBuffer *temp_buffer; }; static struct h264_decoder *impl_from_IMFTransform(IMFTransform *iface) @@ -212,6 +214,11 @@ static HRESULT init_allocator(struct h264_decoder *decoder) if (decoder->allocator_initialized) return S_OK; + if (FAILED(hr = IMFTransform_SetInputType(decoder->copier, 0, decoder->output_type, 0))) + return hr; + if (FAILED(hr = IMFTransform_SetOutputType(decoder->copier, 0, decoder->output_type, 0))) + return hr; + if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(decoder->allocator, 10, 10, decoder->attributes, decoder->output_type))) return hr; @@ -264,7 +271,10 @@ static ULONG WINAPI transform_Release(IMFTransform *iface) if (!refcount) { + IMFTransform_Release(decoder->copier); IMFVideoSampleAllocatorEx_Release(decoder->allocator); + if (decoder->temp_buffer) + IMFMediaBuffer_Release(decoder->temp_buffer); if (decoder->wg_transform) wg_transform_destroy(decoder->wg_transform); if (decoder->input_type) @@ -637,6 +647,36 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS return wg_transform_push_mf(decoder->wg_transform, sample, decoder->wg_sample_queue); } +static HRESULT output_sample(struct h264_decoder *decoder, IMFSample **out, IMFSample *src_sample) +{ + MFT_OUTPUT_DATA_BUFFER output[1]; + IMFSample *sample; + DWORD status; + HRESULT hr; + + if (FAILED(hr = init_allocator(decoder))) + { + ERR("Failed to initialize allocator, hr %#lx.\n", hr); + return hr; + } + if (FAILED(hr = IMFVideoSampleAllocatorEx_AllocateSample(decoder->allocator, &sample))) + return hr; + + if (FAILED(hr = IMFTransform_ProcessInput(decoder->copier, 0, src_sample, 0))) + { + IMFSample_Release(sample); + return hr; + } + output[0].pSample = sample; + if (FAILED(hr = IMFTransform_ProcessOutput(decoder->copier, 0, 1, output, &status))) + { + IMFSample_Release(sample); + return hr; + } + *out = sample; + return S_OK; +} + static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) { @@ -646,6 +686,7 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, IMFSample *sample; UINT64 frame_rate; GUID subtype; + DWORD size; HRESULT hr; TRACE("iface %p, flags %#lx, count %lu, samples %p, status %p.\n", iface, flags, count, samples, status); @@ -668,14 +709,21 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, if (decoder->output_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES) { - if (FAILED(hr = init_allocator(decoder))) + if (decoder->temp_buffer) { - ERR("Failed to initialize allocator, hr %#lx.\n", hr); - return hr; + if (FAILED(IMFMediaBuffer_GetMaxLength(decoder->temp_buffer, &size)) || size < sample_size) + { + IMFMediaBuffer_Release(decoder->temp_buffer); + decoder->temp_buffer = NULL; + } } - if (FAILED(hr = IMFVideoSampleAllocatorEx_AllocateSample(decoder->allocator, &sample))) + if (!decoder->temp_buffer && FAILED(hr = MFCreateMemoryBuffer(sample_size, &decoder->temp_buffer))) + return hr; + if (FAILED(hr = MFCreateSample(&sample))) + return hr; + if (FAILED(hr = IMFSample_AddBuffer(sample, decoder->temp_buffer))) { - ERR("Failed to allocate sample, hr %#lx.\n", hr); + IMFSample_Release(sample); return hr; } } @@ -705,10 +753,9 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, if (decoder->output_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES) { - if (hr == S_OK) - samples->pSample = sample; - else - IMFSample_Release(sample); + if (hr == S_OK && FAILED(hr = output_sample(decoder, &samples->pSample, sample))) + ERR("Failed to output sample, hr %#lx.\n", hr); + IMFSample_Release(sample); } return hr; @@ -800,12 +847,16 @@ HRESULT h264_decoder_create(REFIID riid, void **ret) goto failed; if (FAILED(hr = MFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&decoder->allocator))) goto failed; + if (FAILED(hr = MFCreateSampleCopierMFT(&decoder->copier))) + goto failed; *ret = &decoder->IMFTransform_iface; TRACE("Created decoder %p\n", *ret); return S_OK; failed: + if (decoder->allocator) + IMFVideoSampleAllocatorEx_Release(decoder->allocator); if (decoder->wg_sample_queue) wg_sample_queue_destroy(decoder->wg_sample_queue); if (decoder->output_attributes)

1 0

Jactry Zeng : include: Add FWF_NONE.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: eef4393fb7207bb1d2a31df3efff0d34f3fd3fb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/eef4393fb7207bb1d2a31df3efff0d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Apr 6 23:42:36 2023 -0500 include: Add FWF_NONE. --- include/shobjidl.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index e213958f6e2..8aa24ea86fc 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -699,6 +699,7 @@ typedef char *LPVIEWSETTINGS; typedef [v1_enum] enum FOLDERFLAGS { + FWF_NONE = 0x00000000, FWF_AUTOARRANGE = 0x00000001, FWF_ABBREVIATEDNAMES = 0x00000002, FWF_SNAPTOGRID = 0x00000004,

1 0

Jactry Zeng : shell32/tests: Move interfaces creation to a function.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: bac369eb00f401e6ed1755322cc85a024de63e3b URL: https://gitlab.winehq.org/wine/wine/-/commit/bac369eb00f401e6ed1755322cc85a… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Apr 8 09:57:54 2023 -0500 shell32/tests: Move interfaces creation to a function. --- dlls/shell32/tests/shlview.c | 76 +++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 46 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index d25d626f829..9f85ba0459d 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -619,6 +619,22 @@ static const IShellBrowserVtbl shellbrowservtbl = { static IShellBrowser test_shellbrowser = { &shellbrowservtbl }; +static void create_interfaces(IShellFolder **desktop, IShellView **view) +{ + HRESULT hr; + + hr = SHGetDesktopFolder(desktop); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IShellFolder_CreateViewObject(*desktop, NULL, &IID_IShellView, (void **)view); + ok(hr == S_OK, "Got hr %#lx.\n", hr); +} + +static void destroy_interfaces(IShellFolder *desktop, IShellView *view) +{ + IShellFolder_Release(desktop); + IShellView_Release(view); +} + static void test_CreateViewWindow(void) { IShellFolder *desktop; @@ -631,11 +647,7 @@ static void test_CreateViewWindow(void) ULONG ref1, ref2; IUnknown *unk; - hr = SHGetDesktopFolder(&desktop); - ok(hr == S_OK, "got (0x%08lx)\n", hr); - - hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); - ok(hr == S_OK, "got (0x%08lx)\n", hr); + create_interfaces(&desktop, &view); hr = IShellView_QueryInterface(view, &IID_CDefView, (void **)&unk); ok(hr == S_OK, "got (0x%08lx)\n", hr); @@ -719,18 +731,13 @@ static void test_IFolderView(void) POINT pt; RECT r; - hr = SHGetDesktopFolder(&desktop); - ok(hr == S_OK, "got (0x%08lx)\n", hr); - - hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); - ok(hr == S_OK, "got (0x%08lx)\n", hr); + create_interfaces(&desktop, &view); hr = IShellView_QueryInterface(view, &IID_IFolderView, (void**)&fv); if (hr != S_OK) { win_skip("IFolderView not supported by desktop folder\n"); - IShellView_Release(view); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, view); return; } @@ -772,8 +779,7 @@ if (0) win_skip("Failed to subclass ListView control\n"); IShellBrowser_Release(browser); IFolderView_Release(fv); - IShellView_Release(view); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, view); return; } @@ -863,8 +869,7 @@ if (0) IShellBrowser_Release(browser); IFolderView_Release(fv); - IShellView_Release(view); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, view); } static void test_GetItemObject(void) @@ -874,11 +879,7 @@ static void test_GetItemObject(void) IUnknown *unk; HRESULT hr; - hr = SHGetDesktopFolder(&desktop); - ok(hr == S_OK, "got (0x%08lx)\n", hr); - - hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); - ok(hr == S_OK, "got (0x%08lx)\n", hr); + create_interfaces(&desktop, &view); /* from documentation three interfaces are supported for SVGIO_BACKGROUND: IContextMenu, IDispatch, IPersistHistory */ @@ -900,8 +901,7 @@ static void test_GetItemObject(void) hr = IShellView_GetItemObject(view, SVGIO_BACKGROUND, &IID_IPersist, (void**)&unk); ok(hr == E_NOINTERFACE || broken(hr == E_NOTIMPL) /* W2K */, "got (0x%08lx)\n", hr); - IShellView_Release(view); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, view); } static void test_IShellFolderView(void) @@ -913,18 +913,13 @@ static void test_IShellFolderView(void) UINT i; HRESULT hr; - hr = SHGetDesktopFolder(&desktop); - ok(hr == S_OK, "got (0x%08lx)\n", hr); - - hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); - ok(hr == S_OK, "got (0x%08lx)\n", hr); + create_interfaces(&desktop, &view); hr = IShellView_QueryInterface(view, &IID_IShellFolderView, (void**)&folderview); if (hr != S_OK) { win_skip("IShellView doesn't provide IShellFolderView on this platform\n"); - IShellView_Release(view); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, view); return; } @@ -955,8 +950,7 @@ static void test_IShellFolderView(void) IShellFolderView_Release(folderview); - IShellView_Release(view); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, view); } static void test_IOleWindow(void) @@ -966,11 +960,7 @@ static void test_IOleWindow(void) IOleWindow *wnd; HRESULT hr; - hr = SHGetDesktopFolder(&desktop); - ok(hr == S_OK, "got (0x%08lx)\n", hr); - - hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); - ok(hr == S_OK, "got (0x%08lx)\n", hr); + create_interfaces(&desktop, &view); hr = IShellView_QueryInterface(view, &IID_IOleWindow, (void**)&wnd); ok(hr == E_NOINTERFACE, "got (0x%08lx)\n", hr); @@ -981,8 +971,7 @@ static void test_IOleWindow(void) hr = IShellView_ContextSensitiveHelp(view, FALSE); ok(hr == E_NOTIMPL, "got (0x%08lx)\n", hr); - IShellView_Release(view); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, view); } static const struct message folderview_setcurrentviewmode1_2_prevista[] = { @@ -1088,11 +1077,7 @@ static void test_GetSetCurrentViewMode(void) static const int vista_res[11] = {0, 1, 5, 3, 4, 5, 6, 7, 7, 0, 0}; static const int win7_res[11] = {1, 1, 1, 3, 4, 1, 6, 1, 8, 8, 8}; - hr = SHGetDesktopFolder(&desktop); - ok(hr == S_OK, "got (0x%08lx)\n", hr); - - hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&sview); - ok(hr == S_OK, "got (0x%08lx)\n", hr); + create_interfaces(&desktop, &sview); hr = IShellView_QueryInterface(sview, &IID_IFolderView, (void **)&fview); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -1290,8 +1275,7 @@ static void test_GetSetCurrentViewMode(void) IShellBrowser_Release(browser); IShellView_DestroyViewWindow(sview); - IShellView_Release(sview); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, sview); } static void test_IOleCommandTarget(void)

1 0