- Wine-Commits - list.winehq.org

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

April 7, 2023

Module: wine Branch: master Commit: b46bf3ffb14d193c430f1707aa0480b92057c029 URL: https://gitlab.winehq.org/wine/wine/-/commit/b46bf3ffb14d193c430f1707aa0480… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 30 13:36:49 2023 +0200 msvcrt: Use the __sindf() implementation from the bundled musl library. With the changes from ee7b5ebc3a7843fc2997d5cc5f7784c4d51b4f8d. --- dlls/msvcrt/math.c | 20 +------------------- libs/musl/src/math/__sindf.c | 10 ++++++---- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index befd05e9ad0..8fa904b1cc9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -219,25 +219,7 @@ float CDECL _chgsignf( float num ) #endif #ifndef __i386__ -/* Copied from musl: src/math/__sindf.c */ -static float __sindf(double x) -{ - static const double S1 = -0x1.5555555555555p-3, - S2 = 0x1.1111111111111p-7, - S3 = -0x1.a01a01a01a01ap-13, - S4 = 0x1.71de3a556c734p-19; - - double r, s, w, z; - - z = x * x; - if (x > -7.8175831586122513e-03 && x < 7.8175831586122513e-03) - return x * (1 + S1 * z); - - w = z * z; - r = S3 + z * S4; - s = z * x; - return (x + s * (S1 + z * S2)) + s * w * r; -} +extern float __sindf(double x); /* Copied from musl: src/math/__cosdf.c */ static float __cosdf(double x) diff --git a/libs/musl/src/math/__sindf.c b/libs/musl/src/math/__sindf.c index 8fec2a3f660..fda8a247621 100644 --- a/libs/musl/src/math/__sindf.c +++ b/libs/musl/src/math/__sindf.c @@ -18,10 +18,10 @@ /* |sin(x)/x - s(x)| < 2**-37.5 (~[-4.89e-12, 4.824e-12]). */ static const double -S1 = -0x15555554cbac77.0p-55, /* -0.166666666416265235595 */ -S2 = 0x111110896efbb2.0p-59, /* 0.0083333293858894631756 */ -S3 = -0x1a00f9e2cae774.0p-65, /* -0.000198393348360966317347 */ -S4 = 0x16cd878c3b46a7.0p-71; /* 0.0000027183114939898219064 */ +S1 = -0x1.5555555555555p-3, +S2 = 0x1.1111111111111p-7, +S3 = -0x1.a01a01a01a01ap-13, +S4 = 0x1.71de3a556c734p-19; float __sindf(double x) { @@ -29,6 +29,8 @@ float __sindf(double x) /* Try to optimize for parallel evaluation as in __tandf.c. */ z = x*x; + if (x > -7.8175831586122513e-03 && x < 7.8175831586122513e-03) + return x * (1 + S1 * z); w = z*z; r = S3 + z*S4; s = z*x;

1 0

Alexandre Julliard : msvcrt: Use the nextafter()/nextafterf() implementation from the bundled musl library.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 85e655445bb0d8aa5951f9c53eebaf3c4c37897a URL: https://gitlab.winehq.org/wine/wine/-/commit/85e655445bb0d8aa5951f9c53eebaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 16:48:53 2023 +0200 msvcrt: Use the nextafter()/nextafterf() implementation from the bundled musl library. --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr120/msvcr120.spec | 10 ++--- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/math.c | 89 +---------------------------------------- dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 20 ++++----- libs/musl/src/math/nextafter.c | 14 +++++-- libs/musl/src/math/nextafterf.c | 14 +++++-- 14 files changed, 52 insertions(+), 123 deletions(-)

1 0

Alexandre Julliard : msvcrt: Use the __rem_pio2()/__rem_pio2f() implementation from the bundled musl library.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: b9b19ea2db2266b3cb35d20882e286dc117d04c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9b19ea2db2266b3cb35d20882e286… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 17:36:09 2023 +0200 msvcrt: Use the __rem_pio2()/__rem_pio2f() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 424 +-------------------------------------- libs/musl/src/math/__rem_pio2.c | 2 +- libs/musl/src/math/__rem_pio2f.c | 2 +- 3 files changed, 10 insertions(+), 418 deletions(-)

1 0

Alexandre Julliard : msvcrt: Use the nexttoward()/nexttowardf() implementation from the bundled musl library.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 8252be560eb836755157bf07876b447e6bf36957 URL: https://gitlab.winehq.org/wine/wine/-/commit/8252be560eb836755157bf07876b44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 17:35:07 2023 +0200 msvcrt: Use the nexttoward()/nexttowardf() implementation from the bundled musl library. Rename the musl functions to avoid compiler warnings about the signature mismatch (double vs. long double). --- dlls/msvcr120/msvcr120.spec | 6 ++--- dlls/msvcrt/math.c | 53 ---------------------------------------- dlls/ucrtbase/ucrtbase.spec | 12 ++++----- libs/musl/src/math/nexttoward.c | 2 +- libs/musl/src/math/nexttowardf.c | 10 +++++--- 5 files changed, 17 insertions(+), 66 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index cdd5848f7e9..102d6319f47 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2303,9 +2303,9 @@ @ cdecl nextafter(double double) @ cdecl nextafterf(float float) @ cdecl nextafterl(double double) nextafter -@ cdecl nexttoward(double double) MSVCRT_nexttoward -@ cdecl nexttowardf(float double) MSVCRT_nexttowardf -@ cdecl nexttowardl(double double) MSVCRT_nexttoward +@ cdecl nexttoward(double double) __nexttoward +@ cdecl nexttowardf(float double) __nexttowardf +@ cdecl nexttowardl(double double) __nexttoward @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index dbd9bde4d32..68218b7007b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4076,59 +4076,6 @@ float CDECL nearbyintf(float x) return x; } -/********************************************************************* - * nexttoward (MSVCR120.@) - */ -double CDECL MSVCRT_nexttoward(double num, double next) -{ - return nextafter(num, next); -} - -/********************************************************************* - * nexttowardf (MSVCR120.@) - * - * Copied from musl: src/math/nexttowardf.c - */ -float CDECL MSVCRT_nexttowardf(float x, double y) -{ - unsigned int ix = *(unsigned int*)&x; - unsigned int e; - float ret; - - if (isnan(x) || isnan(y)) - return x + y; - if (x == y) - return y; - if (x == 0) { - ix = 1; - if (signbit(y)) - ix |= 0x80000000; - } else if (x < y) { - if (signbit(x)) - ix--; - else - ix++; - } else { - if (signbit(x)) - ix++; - else - ix--; - } - e = ix & 0x7f800000; - /* raise overflow if ix is infinite and x is finite */ - if (e == 0x7f800000) { - fp_barrierf(x + x); - *_errno() = ERANGE; - } - ret = *(float*)&ix; - /* raise underflow if ret is subnormal or zero */ - if (e == 0) { - fp_barrierf(x * x + ret * ret); - *_errno() = ERANGE; - } - return ret; -} - #endif /* _MSVCR_VER>=120 */ /********************************************************************* diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a6db1a60c5d..a476681fc43 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1733,9 +1733,9 @@ @ cdecl _o_nextafter(double double) nextafter @ cdecl _o_nextafterf(float float) nextafterf @ cdecl _o_nextafterl(double double) nextafter -@ cdecl _o_nexttoward(double double) MSVCRT_nexttoward -@ cdecl _o_nexttowardf(float double) MSVCRT_nexttowardf -@ cdecl _o_nexttowardl(double double) MSVCRT_nexttoward +@ cdecl _o_nexttoward(double double) __nexttoward +@ cdecl _o_nexttowardf(float double) __nexttowardf +@ cdecl _o_nexttowardl(double double) __nexttoward @ cdecl _o_pow(double double) pow @ cdecl -arch=!i386 _o_powf(float float) powf @ cdecl _o_putc(long ptr) putc @@ -2441,9 +2441,9 @@ @ cdecl nextafter(double double) @ cdecl nextafterf(float float) @ cdecl nextafterl(double double) nextafter -@ cdecl nexttoward(double double) MSVCRT_nexttoward -@ cdecl nexttowardf(float double) MSVCRT_nexttowardf -@ cdecl nexttowardl(double double) MSVCRT_nexttoward +@ cdecl nexttoward(double double) __nexttoward +@ cdecl nexttowardf(float double) __nexttowardf +@ cdecl nexttowardl(double double) __nexttoward @ stub norm @ stub normf @ stub norml diff --git a/libs/musl/src/math/nexttoward.c b/libs/musl/src/math/nexttoward.c index e4cef9535c3..85fbb486129 100644 --- a/libs/musl/src/math/nexttoward.c +++ b/libs/musl/src/math/nexttoward.c @@ -1,7 +1,7 @@ #include "libm.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 -double __cdecl nexttoward(double x, long double y) +double __cdecl __nexttoward(double x, double y) { return nextafter(x, y); } diff --git a/libs/musl/src/math/nexttowardf.c b/libs/musl/src/math/nexttowardf.c index 6c32f6c6733..5be52b882d1 100644 --- a/libs/musl/src/math/nexttowardf.c +++ b/libs/musl/src/math/nexttowardf.c @@ -1,6 +1,6 @@ #include "libm.h" -float __cdecl nexttowardf(float x, long double y) +float __cdecl __nexttowardf(float x, double y) { union {float f; uint32_t i;} ux = {x}; uint32_t e; @@ -26,10 +26,14 @@ float __cdecl nexttowardf(float x, long double y) } e = ux.i & 0x7f800000; /* raise overflow if ux.f is infinite and x is finite */ - if (e == 0x7f800000) + if (e == 0x7f800000) { FORCE_EVAL(x+x); + errno = ERANGE; + } /* raise underflow if ux.f is subnormal or zero */ - if (e == 0) + if (e == 0) { FORCE_EVAL(x*x + ux.f*ux.f); + errno = ERANGE; + } return ux.f; }

1 0

Alexandre Julliard : msvcrt: Use the round()/roundf() implementation from the bundled musl library.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 9db27802c3574b18909f5d927331a741e19657df URL: https://gitlab.winehq.org/wine/wine/-/commit/9db27802c3574b18909f5d927331a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 30 16:12:51 2023 +0200 msvcrt: Use the round()/roundf() implementation from the bundled musl library. With the changes from df9c11ffa8ddc3b4dbb22f6e304cba8cfcda8ada. --- dlls/msvcrt/math.c | 68 +++------------------------------------------ libs/musl/src/math/round.c | 32 +++++++++------------ libs/musl/src/math/roundf.c | 2 +- 3 files changed, 18 insertions(+), 84 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 8d4ed01c02f..d9957ad4395 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -467,27 +467,6 @@ recompute: return n & 7; } -/* Based on musl implementation: src/math/round.c */ -static double __round(double x) -{ - ULONGLONG llx = *(ULONGLONG*)&x, tmp; - int e = (llx >> 52 & 0x7ff) - 0x3ff; - - if (e >= 52) - return x; - if (e < -1) - return 0 * x; - else if (e == -1) - return signbit(x) ? -1 : 1; - - tmp = 0x000fffffffffffffULL >> e; - if (!(llx & tmp)) - return x; - llx += 0x0008000000000000ULL >> e; - llx &= ~tmp; - return *(double*)&llx; -} - #ifndef __i386__ /* Copied from musl: src/math/__sindf.c */ static float __sindf(double x) @@ -945,7 +924,7 @@ 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. */ - kd = __round(z); + kd = round(z); ki = (INT64)kd; r = z - kd; @@ -1037,7 +1016,7 @@ static float powf_exp2(double xd, UINT32 sign_bias) double kd, z, r, r2, y, s; /* N*x = k + r with r in [-1/2, 1/2] */ - kd = __round(xd); /* k */ + kd = round(xd); /* k */ ki = (INT64)kd; r = xd - kd; @@ -2187,7 +2166,7 @@ double CDECL exp( double x ) /* exp(x) = 2^(k/N) * exp(r), with exp(r) in [2^(-1/2N),2^(1/2N)]. */ /* x = ln2/N*k + r, with int k and r in [-ln2/2N, ln2/2N]. */ z = invln2N * x; - kd = __round(z); + kd = round(z); ki = (INT64)kd; r = x + kd * negln2hiN + kd * negln2loN; @@ -2495,7 +2474,7 @@ static double pow_exp(double argx, double argy, double x, double xtail, UINT32 s /* exp(x) = 2^(k/N) * exp(r), with exp(r) in [2^(-1/2N),2^(1/2N)]. */ /* x = ln2/N*k + r, with int k and r in [-ln2/2N, ln2/2N]. */ z = invln2N * x; - kd = __round(z); + kd = round(z); ki = (INT64)kd; r = x + kd * negln2hiN + kd * negln2loN; /* The code assumes 2^-200 < |xtail| < 2^-8/N. */ @@ -5336,45 +5315,6 @@ __int64 CDECL llrintf(float x) return f; } -/********************************************************************* - * round (MSVCR120.@) - */ -double CDECL round(double x) -{ - return __round(x); -} - -/********************************************************************* - * roundf (MSVCR120.@) - * - * Copied from musl: src/math/roundf.c - */ -float CDECL roundf(float x) -{ - static const float toint = 1 / FLT_EPSILON; - - unsigned int ix = *(unsigned int*)&x; - int e = ix >> 23 & 0xff; - float y; - - if (e >= 0x7f + 23) - return x; - if (ix >> 31) - x = -x; - if (e < 0x7f - 1) - return 0 * *(float*)&ix; - y = fp_barrierf(x + toint) - toint - x; - if (y > 0.5f) - y = y + x - 1; - else if (y <= -0.5f) - y = y + x + 1; - else - y = y + x; - if (ix >> 31) - y = -y; - return y; -} - /********************************************************************* * lround (MSVCR120.@) * diff --git a/libs/musl/src/math/round.c b/libs/musl/src/math/round.c index 853b6d8fd65..b8c4c6f1785 100644 --- a/libs/musl/src/math/round.c +++ b/libs/musl/src/math/round.c @@ -5,31 +5,25 @@ #elif FLT_EVAL_METHOD==2 #define EPS LDBL_EPSILON #endif -static const double_t toint = 1/EPS; double __cdecl round(double x) { union {double f; uint64_t i;} u = {x}; - int e = u.i >> 52 & 0x7ff; + uint64_t tmp; + int e = (u.i >> 52 & 0x7ff) - 0x3ff; double_t y; - if (e >= 0x3ff+52) + if (e >= 52) return x; - if (u.i >> 63) - x = -x; - if (e < 0x3ff-1) { - /* raise inexact if x!=0 */ - FORCE_EVAL(x + toint); + if (e < -1) return 0*u.f; - } - y = x + toint - toint - x; - if (y > 0.5) - y = y + x - 1; - else if (y <= -0.5) - y = y + x + 1; - else - y = y + x; - if (u.i >> 63) - y = -y; - return y; + if (e == -1) + return (u.i >> 63) ? -1 : 1; + + tmp = 0x000fffffffffffffULL >> e; + if (!(u.i & tmp)) + return x; + u.i += 0x0008000000000000ULL >> e; + u.i &= ~tmp; + return u.f; } diff --git a/libs/musl/src/math/roundf.c b/libs/musl/src/math/roundf.c index b8c20778a1a..88130777fd7 100644 --- a/libs/musl/src/math/roundf.c +++ b/libs/musl/src/math/roundf.c @@ -23,7 +23,7 @@ float __cdecl roundf(float x) FORCE_EVAL(x + toint); return 0*u.f; } - y = x + toint - toint - x; + y = fp_barrierf(x + toint) - toint - x; if (y > 0.5f) y = y + x - 1; else if (y <= -0.5f)

1 0

Zhiyi Zhang : light.msstyles: Use border fill background for progress parts.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 2960cf2e0616216fb8d01e11d7ca7475bfe26d97 URL: https://gitlab.winehq.org/wine/wine/-/commit/2960cf2e0616216fb8d01e11d7ca74… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 6 16:14:28 2023 +0800 light.msstyles: Use border fill background for progress parts. These parts only contain simple images that can be achieved with border fill backgrounds as well. So visually, this change is a no-op. The reason for using image file backgrounds is that I tend to use the same background type as the theme files for Windows. However, drawing border fill background is much more efficient. Pro Evolution Soccer 2008 demo is buggy and generates ~570,000 WM_PAINT messages for the progress control. On Windows, it's ~1,140,000 WM_PAINT messages. DrawThemeBackground() on Wine is 10x more expensive than that of Windows and I found little room for optimization. 60% of the time in DrawThemeBackground() is spend for CreateCompatibleDC() and other 30% for actually drawing. So I decided to change light.msstyles instead. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54728 --- dlls/light.msstyles/Makefile.in | 4 -- .../blue_progress_chunk_horizontal.bmp | Bin 2358 -> 0 bytes .../blue_progress_chunk_horizontal.svg | 13 ------ .../blue_progress_chunk_vertical.bmp | Bin 2490 -> 0 bytes .../blue_progress_chunk_vertical.svg | 13 ------ .../blue_progress_track_horizontal.bmp | Bin 2698 -> 0 bytes .../blue_progress_track_horizontal.svg | 13 ------ .../blue_progress_track_vertical.bmp | Bin 886 -> 0 bytes .../blue_progress_track_vertical.svg | 13 ------ dlls/light.msstyles/light.rc | 46 ++++----------------- 10 files changed, 8 insertions(+), 94 deletions(-) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 8c31d5b9b08..dc8837f9364 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -204,10 +204,6 @@ SVG_SRCS = \ blue_navigation_menu_button_32px.svg \ blue_navigation_menu_button_39px.svg \ blue_navigation_menu_button_52px.svg \ - blue_progress_chunk_horizontal.svg \ - blue_progress_chunk_vertical.svg \ - blue_progress_track_horizontal.svg \ - blue_progress_track_vertical.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ blue_radiobutton_19px.svg \ diff --git a/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp b/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp deleted file mode 100644 index 60debfe4049..00000000000 Binary files a/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp and /dev/null differ diff --git a/dlls/light.msstyles/blue_progress_chunk_horizontal.svg b/dlls/light.msstyles/blue_progress_chunk_horizontal.svg deleted file mode 100644 index 629b667f585..00000000000 --- a/dlls/light.msstyles/blue_progress_chunk_horizontal.svg +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:49-24" width="49" height="15" version="1.1" viewBox="0 0 12.965 3.9688" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <metadata> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> - </cc:Work> - </rdf:RDF> - </metadata> - <rect width="12.965" height="3.9688" fill="#3096fa" style="paint-order:normal"/> -</svg> diff --git a/dlls/light.msstyles/blue_progress_chunk_vertical.bmp b/dlls/light.msstyles/blue_progress_chunk_vertical.bmp deleted file mode 100644 index f9816b09dcf..00000000000 Binary files a/dlls/light.msstyles/blue_progress_chunk_vertical.bmp and /dev/null differ diff --git a/dlls/light.msstyles/blue_progress_chunk_vertical.svg b/dlls/light.msstyles/blue_progress_chunk_vertical.svg deleted file mode 100644 index 4f43374dce5..00000000000 --- a/dlls/light.msstyles/blue_progress_chunk_vertical.svg +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:15-24" width="15" height="49" version="1.1" viewBox="0 0 3.9687 12.965" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <metadata> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> - </cc:Work> - </rdf:RDF> - </metadata> - <rect transform="rotate(90)" y="-3.9688" width="12.965" height="3.9688" fill="#3096fa" style="paint-order:normal"/> -</svg> diff --git a/dlls/light.msstyles/blue_progress_track_horizontal.bmp b/dlls/light.msstyles/blue_progress_track_horizontal.bmp deleted file mode 100644 index 43d5eaa441a..00000000000 Binary files a/dlls/light.msstyles/blue_progress_track_horizontal.bmp and /dev/null differ diff --git a/dlls/light.msstyles/blue_progress_track_horizontal.svg b/dlls/light.msstyles/blue_progress_track_horizontal.svg deleted file mode 100644 index af25bbbcd51..00000000000 --- a/dlls/light.msstyles/blue_progress_track_horizontal.svg +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:53-24" width="53" height="16" version="1.1" viewBox="0 0 14.023 4.2333" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <metadata> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> - </cc:Work> - </rdf:RDF> - </metadata> - <rect x=".13229" y=".13229" width="13.758" height="3.9688" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> -</svg> diff --git a/dlls/light.msstyles/blue_progress_track_vertical.bmp b/dlls/light.msstyles/blue_progress_track_vertical.bmp deleted file mode 100644 index 5dddee9c32e..00000000000 Binary files a/dlls/light.msstyles/blue_progress_track_vertical.bmp and /dev/null differ diff --git a/dlls/light.msstyles/blue_progress_track_vertical.svg b/dlls/light.msstyles/blue_progress_track_vertical.svg deleted file mode 100644 index 2f0f638bd8a..00000000000 --- a/dlls/light.msstyles/blue_progress_track_vertical.svg +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:14-24" width="14" height="17" version="1.1" viewBox="0 0 3.7042 4.4979" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <metadata> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> - </cc:Work> - </rdf:RDF> - </metadata> - <rect x=".13229" y=".13229" width="3.4396" height="4.2333" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> -</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 3a374f5416d..c8e358b3352 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -1215,29 +1215,19 @@ BLUE_INI TEXTFILE "BorderColor = 174 174 174\r\n" "[Progress.Bar]\r\n" -"BgType = ImageFile\r\n" -"ImageFile = blue_progress_track_horizontal.bmp\r\n" "MinSize = 10, 10\r\n" -"SizingMargins = 1, 1, 1, 1\r\n" -"SizingType = Stretch\r\n" +"FillColor = 255 255 255\r\n" "[Progress.BarVert]\r\n" -"BgType = ImageFile\r\n" -"ImageFile = blue_progress_track_vertical.bmp\r\n" -"SizingMargins = 1, 1, 1, 1\r\n" -"SizingType = Stretch\r\n" +"FillColor = 255 255 255\r\n" "[Progress.Chunk]\r\n" -"BgType = ImageFile\r\n" -"ImageFile = blue_progress_chunk_horizontal.bmp\r\n" -"SizingMargins = 1, 1, 1, 1\r\n" -"SizingType = Stretch\r\n" +"BorderSize = 0\r\n" +"FillColor = 48 150 250\r\n" "[Progress.ChunkVert]\r\n" -"BgType = ImageFile\r\n" -"ImageFile = blue_progress_chunk_vertical.bmp\r\n" -"SizingMargins = 1, 1, 1, 1\r\n" -"SizingType = Stretch\r\n" +"BorderSize = 0\r\n" +"FillColor = 48 150 250\r\n" "[Progress.Fill]\r\n" "FillColor = 48 150 250\r\n" @@ -1276,17 +1266,10 @@ BLUE_INI TEXTFILE "BgType = None\r\n" "[Progress.TransparentBar]\r\n" -"BgType = ImageFile\r\n" -"ImageFile = blue_progress_track_horizontal.bmp\r\n" -"MinSize = 10, 10\r\n" -"SizingMargins = 1, 1, 1, 1\r\n" -"SizingType = Stretch\r\n" +"FillColor = 255 255 255\r\n" "[Progress.TransparentBarVert]\r\n" -"BgType = ImageFile\r\n" -"ImageFile = blue_progress_track_vertical.bmp\r\n" -"SizingMargins = 1, 1, 1, 1\r\n" -"SizingType = Stretch\r\n" +"FillColor = 255 255 255\r\n" "\r\n; Rebar\r\n" "[Rebar]\r\n" @@ -3530,19 +3513,6 @@ BLUE_NAVIGATION_MENU_BUTTON_39PX_BMP BITMAP "blue_navigation_menu_button_39px.bm /* @makedep: blue_navigation_menu_button_52px.bmp */ BLUE_NAVIGATION_MENU_BUTTON_52PX_BMP BITMAP "blue_navigation_menu_button_52px.bmp" -/* Progress */ -/* @makedep: blue_progress_chunk_horizontal.bmp */ -BLUE_PROGRESS_CHUNK_HORIZONTAL_BMP BITMAP "blue_progress_chunk_horizontal.bmp" - -/* @makedep: blue_progress_chunk_vertical.bmp */ -BLUE_PROGRESS_CHUNK_VERTICAL_BMP BITMAP "blue_progress_chunk_vertical.bmp" - -/* @makedep: blue_progress_track_horizontal.bmp */ -BLUE_PROGRESS_TRACK_HORIZONTAL_BMP BITMAP "blue_progress_track_horizontal.bmp" - -/* @makedep: blue_progress_track_vertical.bmp */ -BLUE_PROGRESS_TRACK_VERTICAL_BMP BITMAP "blue_progress_track_vertical.bmp" - /* Rebar */ /* @makedep: blue_rebar_background.bmp */ BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp"

1 0

Zebediah Figura : winegstreamer: Move flipping based on RGB to the frontends.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 6c11a4af5885c6485a908ea5c547e072fe71aa23 URL: https://gitlab.winehq.org/wine/wine/-/commit/6c11a4af5885c6485a908ea5c547e0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 24 16:03:37 2023 -0600 winegstreamer: Move flipping based on RGB to the frontends. Give the backend a more simple and self-consistent API. This commit also changes behaviour, by virtue of *not* changing some frontends. In specific, this commit does not modify the AVI splitter, which is known to output top-down RGB samples on Windows if the original video uses them (this is trivial to test by modifying test.avi in quartz to use "bgra" instead of "yuv420p"). It also does not modify the Media Foundation color converter DMO, whose tests imply that the MF_MT_DEFAULT_STRIDE attribute is always positive. --- dlls/winegstreamer/mfplat.c | 8 ++++---- dlls/winegstreamer/quartz_parser.c | 9 ++++++++- dlls/winegstreamer/unixlib.h | 2 ++ dlls/winegstreamer/wg_parser.c | 21 --------------------- dlls/winegstreamer/wm_reader.c | 9 ++++++++- dlls/winegstreamer/wmv_decoder.c | 4 ++-- 6 files changed, 24 insertions(+), 29 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index af164614b43..9cf98ec9dc4 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -527,8 +527,6 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); IMFMediaType_SetUINT32(type, &MF_MT_VIDEO_ROTATION, MFVideoRotationFormat_0); - if (wg_video_format_is_rgb(format->u.video.format)) - stride = -stride; if (format->u.video.height < 0) stride = -stride; IMFMediaType_SetUINT32(type, &MF_MT_DEFAULT_STRIDE, stride); @@ -732,11 +730,13 @@ static void mf_media_type_to_wg_format_video(IMFMediaType *type, const GUID *sub if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_DEFAULT_STRIDE, &stride))) { - if (wg_video_format_is_rgb(format->u.video.format)) - format->u.video.height = -format->u.video.height; if ((int)stride < 0) format->u.video.height = -format->u.video.height; } + else if (wg_video_format_is_rgb(format->u.video.format)) + { + format->u.video.height = -format->u.video.height; + } } static void mf_media_type_to_wg_format_audio_wma(IMFMediaType *type, const GUID *subtype, struct wg_format *format) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 085a43b4297..a5eb939fcbb 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -485,7 +485,7 @@ static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format * if (wm) { - SetRect(&video_format->rcSource, 0, 0, format->u.video.width, format->u.video.height); + SetRect(&video_format->rcSource, 0, 0, format->u.video.width, abs(format->u.video.height)); video_format->rcTarget = video_format->rcSource; } if ((frame_time = MulDiv(10000000, format->u.video.fps_d, format->u.video.fps_n)) != -1) @@ -493,6 +493,8 @@ static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format * video_format->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); video_format->bmiHeader.biWidth = format->u.video.width; video_format->bmiHeader.biHeight = format->u.video.height; + if (wg_video_format_is_rgb(format->u.video.format)) + video_format->bmiHeader.biHeight = -format->u.video.height; video_format->bmiHeader.biPlanes = 1; video_format->bmiHeader.biBitCount = wg_video_format_get_depth(format->u.video.format); video_format->bmiHeader.biCompression = wg_video_format_get_compression(format->u.video.format); @@ -733,6 +735,8 @@ static bool amt_to_wg_format_video(const AM_MEDIA_TYPE *mt, struct wg_format *fo if (IsEqualGUID(&mt->subtype, format_map[i].subtype)) { format->u.video.format = format_map[i].format; + if (wg_video_format_is_rgb(format->u.video.format)) + format->u.video.height = -format->u.video.height; return true; } } @@ -1366,6 +1370,9 @@ static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, if (format.major_type == WG_MAJOR_TYPE_VIDEO && index < ARRAY_SIZE(video_formats)) { format.u.video.format = video_formats[index]; + /* Downstream filters probably expect RGB video to be bottom-up. */ + if (format.u.video.height > 0 && wg_video_format_is_rgb(video_formats[index])) + format.u.video.height = -format.u.video.height; if (!amt_from_wg_format(mt, &format, false)) return E_OUTOFMEMORY; return S_OK; diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 539ccd3e12a..d7bc7c65f0d 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -110,6 +110,8 @@ struct wg_format WG_VIDEO_FORMAT_YV12, WG_VIDEO_FORMAT_YVYU, } format; + /* Positive height indicates top-down video; negative height + * indicates bottom-up video. */ int32_t width, height; uint32_t fps_n, fps_d; RECT padding; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5bb824f4399..a8da149e7be 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -226,27 +226,6 @@ static NTSTATUS wg_parser_stream_enable(void *args) { bool flip = (format->u.video.height < 0); - switch (format->u.video.format) - { - case WG_VIDEO_FORMAT_BGRA: - case WG_VIDEO_FORMAT_BGRx: - case WG_VIDEO_FORMAT_BGR: - case WG_VIDEO_FORMAT_RGB15: - case WG_VIDEO_FORMAT_RGB16: - flip = !flip; - break; - - case WG_VIDEO_FORMAT_AYUV: - case WG_VIDEO_FORMAT_I420: - case WG_VIDEO_FORMAT_NV12: - case WG_VIDEO_FORMAT_UYVY: - case WG_VIDEO_FORMAT_YUY2: - case WG_VIDEO_FORMAT_YV12: - case WG_VIDEO_FORMAT_YVYU: - case WG_VIDEO_FORMAT_UNKNOWN: - break; - } - gst_util_set_object_arg(G_OBJECT(stream->flip), "method", flip ? "vertical-flip" : "none"); } diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 736dbba452c..2e0badba5db 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1508,6 +1508,10 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size) * Shadowgrounds provides wmv3 video and assumes that the initial * video type will be BGR. */ stream->format.u.video.format = WG_VIDEO_FORMAT_BGR; + + /* API consumers expect RGB video to be bottom-up. */ + if (stream->format.u.video.height > 0) + stream->format.u.video.height = -stream->format.u.video.height; } wg_parser_stream_enable(stream->wg_stream, &stream->format); } @@ -1919,6 +1923,9 @@ static HRESULT WINAPI reader_GetOutputFormat(IWMSyncReader2 *iface, return NS_E_INVALID_OUTPUT_FORMAT; } format.u.video.format = video_formats[index]; + /* API consumers expect RGB video to be bottom-up. */ + if (format.u.video.height > 0 && wg_video_format_is_rgb(format.u.video.format)) + format.u.video.height = -format.u.video.height; break; case WG_MAJOR_TYPE_AUDIO: @@ -2211,7 +2218,7 @@ static HRESULT WINAPI reader_SetOutputProps(IWMSyncReader2 *iface, DWORD output, hr = NS_E_INVALID_OUTPUT_FORMAT; else if (pref_format.u.video.width != format.u.video.width) hr = NS_E_INVALID_OUTPUT_FORMAT; - else if (pref_format.u.video.height != format.u.video.height) + else if (abs(pref_format.u.video.height) != abs(format.u.video.height)) hr = NS_E_INVALID_OUTPUT_FORMAT; break; diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c index 46c85964ed7..82c69776bd6 100644 --- a/dlls/winegstreamer/wmv_decoder.c +++ b/dlls/winegstreamer/wmv_decoder.c @@ -446,7 +446,7 @@ static HRESULT WINAPI media_object_GetOutputType(IMediaObject *iface, DWORD inde return DMO_E_TYPE_NOT_SET; width = decoder->input_format.u.video_wmv.width; - height = decoder->input_format.u.video_wmv.height; + height = abs(decoder->input_format.u.video_wmv.height); subtype = wmv_decoder_output_types[type_index].subtype; if (FAILED(hr = MFCalculateImageSize(subtype, width, height, &image_size))) { @@ -632,7 +632,7 @@ static HRESULT WINAPI media_object_GetOutputSizeInfo(IMediaObject *iface, DWORD return DMO_E_TYPE_NOT_SET; if (FAILED(hr = MFCalculateImageSize(&decoder->output_subtype, - decoder->output_format.u.video.width, decoder->output_format.u.video.height, (UINT32 *)size))) + decoder->output_format.u.video.width, abs(decoder->output_format.u.video.height), (UINT32 *)size))) { FIXME("Failed to get image size of subtype %s.\n", debugstr_guid(&decoder->output_subtype)); return hr;

1 0

Zhiyi Zhang : light.msstyles: Don't draw a border for progress fill parts.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 77b6cf56c1e5fc0eb2c5e16ff70cc6137298d73a URL: https://gitlab.winehq.org/wine/wine/-/commit/77b6cf56c1e5fc0eb2c5e16ff70cc6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 6 16:08:11 2023 +0800 light.msstyles: Don't draw a border for progress fill parts. These parts were supposed to contain a solid fill background without a border. If BorderSize is not set, they will use the border size of 1 from the inherited progress class. --- dlls/light.msstyles/light.rc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c8e358b3352..feb48034dea 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -1230,27 +1230,35 @@ BLUE_INI TEXTFILE "FillColor = 48 150 250\r\n" "[Progress.Fill]\r\n" +"BorderSize = 0\r\n" "FillColor = 48 150 250\r\n" "[Progress.FillVert]\r\n" +"BorderSize = 0\r\n" "FillColor = 48 150 250\r\n" "[Progress.Fill(Error)]\r\n" +"BorderSize = 0\r\n" "FillColor = 213 0 0\r\n" "[Progress.FillVert(Error)]\r\n" +"BorderSize = 0\r\n" "FillColor = 213 0 0\r\n" "[Progress.Fill(Paused)]\r\n" +"BorderSize = 0\r\n" "FillColor = 255 238 88\r\n" "[Progress.FillVert(Paused)]\r\n" +"BorderSize = 0\r\n" "FillColor = 255 238 88\r\n" "[Progress.Fill(Partial)]\r\n" +"BorderSize = 0\r\n" "FillColor = 189 189 189\r\n" "[Progress.FillVert(Partial)]\r\n" +"BorderSize = 0\r\n" "FillColor = 189 189 189\r\n" "[Progress.PulseOverlay]\r\n"

1 0

Zebediah Figura : winegstreamer: Translate the MF_MT_DEFAULT_STRIDE attribute to flipped video in mf_media_type_to_wg_format().
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: af82c44e03ab5355f60b0796b5420b3688ea86a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/af82c44e03ab5355f60b0796b5420b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 24 15:59:45 2023 -0600 winegstreamer: Translate the MF_MT_DEFAULT_STRIDE attribute to flipped video in mf_media_type_to_wg_format(). --- dlls/winegstreamer/mfplat.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 257ffb381a8..af164614b43 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -699,7 +699,7 @@ static void mf_media_type_to_wg_format_video(IMFMediaType *type, const GUID *sub { UINT64 frame_rate, frame_size; MFVideoArea aperture; - UINT32 size; + UINT32 size, stride; if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size))) { @@ -729,6 +729,14 @@ static void mf_media_type_to_wg_format_video(IMFMediaType *type, const GUID *sub } format->u.video.format = mf_video_format_to_wg(subtype); + + if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_DEFAULT_STRIDE, &stride))) + { + if (wg_video_format_is_rgb(format->u.video.format)) + format->u.video.height = -format->u.video.height; + if ((int)stride < 0) + format->u.video.height = -format->u.video.height; + } } static void mf_media_type_to_wg_format_audio_wma(IMFMediaType *type, const GUID *subtype, struct wg_format *format)

1 0

Piotr Caban : wineps: Handle EMR_PLGBLT record in spool files.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 93c5adbf9273199e3e98e7eab634eca7fda608e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/93c5adbf9273199e3e98e7eab634ec… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 6 20:11:08 2023 +0200 wineps: Handle EMR_PLGBLT record in spool files. --- dlls/wineps.drv/printproc.c | 103 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 1f94e4782b9..399e8a8c212 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -527,6 +527,103 @@ static int mask_blt(PHYSDEV dev, const EMRMASKBLT *p, const BITMAPINFO *src_bi, return TRUE; } +static void combine_transform(XFORM *result, const XFORM *xform1, const XFORM *xform2) +{ + XFORM r; + + /* Create the result in a temporary XFORM, since result may be + * equal to xform1 or xform2 */ + r.eM11 = xform1->eM11 * xform2->eM11 + xform1->eM12 * xform2->eM21; + r.eM12 = xform1->eM11 * xform2->eM12 + xform1->eM12 * xform2->eM22; + r.eM21 = xform1->eM21 * xform2->eM11 + xform1->eM22 * xform2->eM21; + r.eM22 = xform1->eM21 * xform2->eM12 + xform1->eM22 * xform2->eM22; + r.eDx = xform1->eDx * xform2->eM11 + xform1->eDy * xform2->eM21 + xform2->eDx; + r.eDy = xform1->eDx * xform2->eM12 + xform1->eDy * xform2->eM22 + xform2->eDy; + + *result = r; +} + +static int plg_blt(PHYSDEV dev, const EMRPLGBLT *p) +{ + const BITMAPINFO *src_bi, *mask_bi; + const BYTE *src_bits, *mask_bits; + XFORM xf, xform_dest; + EMRMASKBLT maskblt; + /* rect coords */ + POINT rect[3]; + /* parallelogram coords */ + POINT plg[3]; + double det; + + memcpy(plg, p->aptlDest, sizeof(plg)); + rect[0].x = p->xSrc; + rect[0].y = p->ySrc; + rect[1].x = p->xSrc + p->cxSrc; + rect[1].y = p->ySrc; + rect[2].x = p->xSrc; + rect[2].y = p->ySrc + p->cySrc; + /* calc XFORM matrix to transform hdcDest -> hdcSrc (parallelogram to rectangle) */ + /* determinant */ + det = rect[1].x*(rect[2].y - rect[0].y) - rect[2].x*(rect[1].y - rect[0].y) - rect[0].x*(rect[2].y - rect[1].y); + + if (fabs(det) < 1e-5) + return TRUE; + + TRACE("%ld,%ld,%ldx%ld -> %ld,%ld,%ld,%ld,%ld,%ld\n", p->xSrc, p->ySrc, p->cxSrc, p->cySrc, + plg[0].x, plg[0].y, plg[1].x, plg[1].y, plg[2].x, plg[2].y); + + /* X components */ + xf.eM11 = (plg[1].x*(rect[2].y - rect[0].y) - plg[2].x*(rect[1].y - rect[0].y) - plg[0].x*(rect[2].y - rect[1].y)) / det; + xf.eM21 = (rect[1].x*(plg[2].x - plg[0].x) - rect[2].x*(plg[1].x - plg[0].x) - rect[0].x*(plg[2].x - plg[1].x)) / det; + xf.eDx = (rect[0].x*(rect[1].y*plg[2].x - rect[2].y*plg[1].x) - + rect[1].x*(rect[0].y*plg[2].x - rect[2].y*plg[0].x) + + rect[2].x*(rect[0].y*plg[1].x - rect[1].y*plg[0].x) + ) / det; + + /* Y components */ + xf.eM12 = (plg[1].y*(rect[2].y - rect[0].y) - plg[2].y*(rect[1].y - rect[0].y) - plg[0].y*(rect[2].y - rect[1].y)) / det; + xf.eM22 = (rect[1].x*(plg[2].y - plg[0].y) - rect[2].x*(plg[1].y - plg[0].y) - rect[0].x*(plg[2].y - plg[1].y)) / det; + xf.eDy = (rect[0].x*(rect[1].y*plg[2].y - rect[2].y*plg[1].y) - + rect[1].x*(rect[0].y*plg[2].y - rect[2].y*plg[0].y) + + rect[2].x*(rect[0].y*plg[1].y - rect[1].y*plg[0].y) + ) / det; + + combine_transform(&xf, &xf, &p->xformSrc); + + GetTransform(dev->hdc, 0x203, &xform_dest); + SetWorldTransform(dev->hdc, &xf); + /* now destination and source DCs use same coords */ + maskblt.rclBounds = p->rclBounds; + maskblt.xDest = p->xSrc; + maskblt.yDest = p->ySrc; + maskblt.cxDest = p->cxSrc; + maskblt.cyDest = p->cySrc; + maskblt.dwRop = SRCCOPY; + maskblt.xSrc = p->xSrc; + maskblt.ySrc = p->ySrc; + maskblt.xformSrc = p->xformSrc; + maskblt.crBkColorSrc = p->crBkColorSrc; + maskblt.iUsageSrc = p->iUsageSrc; + maskblt.offBmiSrc = 0; + maskblt.cbBmiSrc = p->cbBmiSrc; + maskblt.offBitsSrc = 0; + maskblt.cbBitsSrc = p->cbBitsSrc; + maskblt.xMask = p->xMask; + maskblt.yMask = p->yMask; + maskblt.iUsageMask = p->iUsageMask; + maskblt.offBmiMask = 0; + maskblt.cbBmiMask = p->cbBmiMask; + maskblt.offBitsMask = 0; + maskblt.cbBitsMask = p->cbBitsMask; + src_bi = (const BITMAPINFO *)((BYTE *)p + p->offBmiSrc); + src_bits = (BYTE *)p + p->offBitsSrc; + mask_bi = (const BITMAPINFO *)((BYTE *)p + p->offBmiMask); + mask_bits = (BYTE *)p + p->offBitsMask; + mask_blt(dev, &maskblt, src_bi, src_bits, mask_bi, mask_bits); + SetWorldTransform(dev->hdc, &xform_dest); + return TRUE; +} + static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, const ENHMETARECORD *rec, int n, LPARAM arg) { @@ -802,6 +899,12 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return mask_blt(&data->pdev->dev, p, src_bi, src_bits, mask_bi, mask_bits); } + case EMR_PLGBLT: + { + const EMRPLGBLT *p = (const EMRPLGBLT *)rec; + + return plg_blt(&data->pdev->dev, p); + } case EMR_POLYBEZIER16: { const EMRPOLYBEZIER16 *p = (const EMRPOLYBEZIER16 *)rec;

1 0