April 2023 - Wine-commits - list.winehq.org

Piotr Caban : include: Add EMRTRANSPARENTBLT definition.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 8b48ee987f3e70fc252f29d7064344c814fd7bec URL: https://gitlab.winehq.org/wine/wine/-/commit/8b48ee987f3e70fc252f29d7064344… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 17:07:46 2023 +0200 include: Add EMRTRANSPARENTBLT definition. --- include/wingdi.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/wingdi.h b/include/wingdi.h index 046009c0e98..6ae9409803c 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -2717,6 +2717,27 @@ typedef struct { LONG cySrc; } EMRALPHABLEND, *PEMRALPHABLEND; +typedef struct { + EMR emr; + RECTL rclBounds; + LONG xDest; + LONG yDest; + LONG cxDest; + LONG cyDest; + DWORD dwRop; + LONG xSrc; + LONG ySrc; + XFORM xformSrc; + COLORREF crBkColorSrc; + DWORD iUsageSrc; + DWORD offBmiSrc; + DWORD cbBmiSrc; + DWORD offBitsSrc; + DWORD cbBitsSrc; + LONG cxSrc; + LONG cySrc; +} EMRTRANSPARENTBLT, *PEMRTRANSPARENTBLT; + typedef struct { EMR emr; RECTL rclBounds;

1 0

Piotr Caban : gdi32: Handle EMR_TRANSPARENTBLT record in PlayEnhMetaFileRecord.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 747fa33bbb423c191d8af53aef6ef3ab1ea1590a URL: https://gitlab.winehq.org/wine/wine/-/commit/747fa33bbb423c191d8af53aef6ef3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 17:26:19 2023 +0200 gdi32: Handle EMR_TRANSPARENTBLT record in PlayEnhMetaFileRecord. --- dlls/gdi32/enhmetafile.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index bab0d5739cc..b6b51e3483a 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2238,6 +2238,53 @@ BOOL WINAPI PlayEnhMetaFileRecord( break; } + case EMR_TRANSPARENTBLT: + { + const EMRTRANSPARENTBLT *pTransparentBlt = (const EMRTRANSPARENTBLT *)mr; + + TRACE("EMR_TRANSPARENTBLT: %ld, %ld %ldx%ld -> %ld, %ld %ldx%ld color %08lx offBitsSrc %ld\n", + pTransparentBlt->xSrc, pTransparentBlt->ySrc, pTransparentBlt->cxSrc, + pTransparentBlt->cySrc, pTransparentBlt->xDest, pTransparentBlt->yDest, + pTransparentBlt->cxDest, pTransparentBlt->cyDest, + pTransparentBlt->dwRop, pTransparentBlt->offBitsSrc); + + if(pTransparentBlt->offBmiSrc == 0) { + FIXME("EMR_TRANSPARENTBLT: offBmiSrc == 0\n"); + } else { + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); + HBRUSH hBrush, hBrushOld; + HBITMAP hBmp = 0, hBmpOld = 0; + const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pTransparentBlt->offBmiSrc); + + SetGraphicsMode(hdcSrc, GM_ADVANCED); + SetWorldTransform(hdcSrc, &pTransparentBlt->xformSrc); + + hBrush = CreateSolidBrush(pTransparentBlt->crBkColorSrc); + hBrushOld = SelectObject(hdcSrc, hBrush); + PatBlt(hdcSrc, pTransparentBlt->rclBounds.left, pTransparentBlt->rclBounds.top, + pTransparentBlt->rclBounds.right - pTransparentBlt->rclBounds.left, + pTransparentBlt->rclBounds.bottom - pTransparentBlt->rclBounds.top, PATCOPY); + SelectObject(hdcSrc, hBrushOld); + DeleteObject(hBrush); + + hBmp = CreateDIBitmap(hdc, (const BITMAPINFOHEADER *)pbi, CBM_INIT, + (const BYTE *)mr + pTransparentBlt->offBitsSrc, + pbi, pTransparentBlt->iUsageSrc); + hBmpOld = SelectObject(hdcSrc, hBmp); + + GdiTransparentBlt(hdc, pTransparentBlt->xDest, pTransparentBlt->yDest, + pTransparentBlt->cxDest, pTransparentBlt->cyDest, + hdcSrc, pTransparentBlt->xSrc, pTransparentBlt->ySrc, + pTransparentBlt->cxSrc, pTransparentBlt->cySrc, + pTransparentBlt->dwRop); + + SelectObject(hdcSrc, hBmpOld); + DeleteObject(hBmp); + DeleteDC(hdcSrc); + } + break; + } + case EMR_GRADIENTFILL: { EMRGRADIENTFILL *grad = (EMRGRADIENTFILL *)mr; @@ -2257,7 +2304,6 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_COLORCORRECTPALETTE: case EMR_SETICMPROFILEA: case EMR_SETICMPROFILEW: - case EMR_TRANSPARENTBLT: case EMR_SETLINKEDUFI: case EMR_COLORMATCHTOTARGETW: case EMR_CREATECOLORSPACEW:

1 0

Rémi Bernon : imm32: Use INPUTCONTEXT directly in ImmSetCandidateWindow.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: cf03ab413383df151d82a573d5934e18c0889360 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf03ab413383df151d82a573d5934e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 6 01:11:14 2023 +0200 imm32: Use INPUTCONTEXT directly in ImmSetCandidateWindow. --- dlls/imm32/imm.c | 42 +++++++++++++++++++----------------------- dlls/imm32/tests/imm32.c | 2 +- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 68196bf0149..aa63be82e4b 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -127,6 +127,14 @@ static const char *debugstr_composition( const COMPOSITIONFORM *composition ) wine_dbgstr_rect( &composition->rcArea ) ); } +static const char *debugstr_candidate( const CANDIDATEFORM *candidate ) +{ + if (!candidate) return "(null)"; + return wine_dbg_sprintf( "idx %#lx, style %#lx, pos %s, area %s", candidate->dwIndex, + candidate->dwStyle, wine_dbgstr_point( &candidate->ptCurrentPos ), + wine_dbgstr_rect( &candidate->rcArea ) ); +} + static BOOL ime_is_unicode( const struct ime *ime ) { return !!(ime->info.fdwProperty & IME_PROP_UNICODE); @@ -827,13 +835,6 @@ static void imc_send_message( struct imc *imc, TRANSMSG *message ) SendMessageW( target, message->message, message->wParam, message->lParam ); } -static LRESULT imc_notify_ime( struct imc *imc, WPARAM notify, LPARAM lparam ) -{ - HWND target; - if (!(target = imc->IMC.hWnd) && !(target = GetFocus())) return 0; - return SendMessageW( target, WM_IME_NOTIFY, notify, lparam ); -} - /*********************************************************************** * ImmSetActiveContext (IMM32.@) */ @@ -2429,29 +2430,24 @@ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) /*********************************************************************** * ImmSetCandidateWindow (IMM32.@) */ -BOOL WINAPI ImmSetCandidateWindow( - HIMC hIMC, LPCANDIDATEFORM lpCandidate) +BOOL WINAPI ImmSetCandidateWindow( HIMC himc, CANDIDATEFORM *candidate ) { - struct imc *data = get_imc_data( hIMC ); + INPUTCONTEXT *ctx; - TRACE("(%p, %p)\n", hIMC, lpCandidate); + TRACE( "hwnd %p, candidate %s\n", himc, debugstr_candidate( candidate ) ); - if (!data || !lpCandidate) - return FALSE; + if (!candidate) return FALSE; + if (candidate->dwIndex >= ARRAY_SIZE(ctx->cfCandForm)) return FALSE; - if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE; + if (NtUserQueryInputContext( himc, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE; + if (!(ctx = ImmLockIMC( himc ))) return FALSE; - TRACE("\t%lx, %lx, %s, %s\n", - lpCandidate->dwIndex, lpCandidate->dwStyle, - wine_dbgstr_point(&lpCandidate->ptCurrentPos), - wine_dbgstr_rect(&lpCandidate->rcArea)); + ctx->cfCandForm[candidate->dwIndex] = *candidate; - if (lpCandidate->dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm)) - return FALSE; + ImmNotifyIME( himc, NI_CONTEXTUPDATED, 0, IMC_SETCANDIDATEPOS ); + SendMessageW( ctx->hWnd, WM_IME_NOTIFY, IMN_SETCANDIDATEPOS, 1 << candidate->dwIndex ); - data->IMC.cfCandForm[lpCandidate->dwIndex] = *lpCandidate; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCANDIDATEPOS); - imc_notify_ime( data, IMN_SETCANDIDATEPOS, 1 << lpCandidate->dwIndex ); + ImmUnlockIMC( himc ); return TRUE; } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 3b8b4755080..cf6c521e52f 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -6442,7 +6442,7 @@ static void test_ImmSetCandidateWindow(void) .hkl = expect_ime, .himc = 0/*himc*/, .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETCANDIDATEPOS}, }, - {.todo = TRUE}, + {0}, }; CANDIDATEFORM cand_form, expect_form = {

1 0

Rémi Bernon : imm32: Use INPUTCONTEXT directly in ImmGetCandidateWindow.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 01677af42ae683d3b86e68e3a7cc71b1d68844ed URL: https://gitlab.winehq.org/wine/wine/-/commit/01677af42ae683d3b86e68e3a7cc71… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 8 12:02:21 2023 +0200 imm32: Use INPUTCONTEXT directly in ImmGetCandidateWindow. --- dlls/imm32/imm.c | 24 ++++++++++-------------- dlls/imm32/tests/imm32.c | 14 +++++++------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index aa63be82e4b..62b95eba77a 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1390,25 +1390,21 @@ done: /*********************************************************************** * ImmGetCandidateWindow (IMM32.@) */ -BOOL WINAPI ImmGetCandidateWindow( - HIMC hIMC, DWORD dwIndex, LPCANDIDATEFORM lpCandidate) +BOOL WINAPI ImmGetCandidateWindow( HIMC himc, DWORD index, CANDIDATEFORM *candidate ) { - struct imc *data = get_imc_data( hIMC ); - - TRACE("%p, %ld, %p\n", hIMC, dwIndex, lpCandidate); - - if (!data || !lpCandidate) - return FALSE; + INPUTCONTEXT *ctx; + BOOL ret = TRUE; - if (dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm)) - return FALSE; + TRACE( "himc %p, index %lu, candidate %p\n", himc, index, candidate ); - if (data->IMC.cfCandForm[dwIndex].dwIndex != dwIndex) - return FALSE; + if (!candidate) return FALSE; - *lpCandidate = data->IMC.cfCandForm[dwIndex]; + if (!(ctx = ImmLockIMC( himc ))) return FALSE; + if (ctx->cfCandForm[index].dwIndex == -1) ret = FALSE; + else *candidate = ctx->cfCandForm[index]; + ImmUnlockIMC( himc ); - return TRUE; + return ret; } /*********************************************************************** diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index cf6c521e52f..a623cabef7b 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -5653,21 +5653,21 @@ static void test_ImmGetCandidateWindow(void) ok_eq( 0xcdcdcdcd, cand_form.dwIndex, UINT, "%u" ); ok_ret( 0, ImmGetCandidateWindow( default_himc, 3, &cand_form ) ); ok_eq( 0xcdcdcdcd, cand_form.dwIndex, UINT, "%u" ); - todo_wine ok_ret( 1, ImmGetCandidateWindow( default_himc, 4, &cand_form ) ); + ok_ret( 1, ImmGetCandidateWindow( default_himc, 4, &cand_form ) ); ok_seq( empty_sequence ); ok_ret( 0, ImmGetCandidateWindow( himc, 0, &cand_form ) ); ok_seq( empty_sequence ); - todo_wine ok_seq( empty_sequence ); + ok_seq( empty_sequence ); ok( !!ctx, "ImmLockIMC failed, error %lu\n", GetLastError() ); ctx->cfCandForm[0] = expect_form; - todo_wine ok_ret( 1, ImmGetCandidateWindow( himc, 0, &cand_form ) ); - todo_wine check_candidate_form( &cand_form, &expect_form ); + ok_ret( 1, ImmGetCandidateWindow( himc, 0, &cand_form ) ); + check_candidate_form( &cand_form, &expect_form ); ok_seq( empty_sequence ); - todo_wine ok_seq( empty_sequence ); + ok_seq( empty_sequence ); ok( !!ctx, "ImmLockIMC failed, error %lu\n", GetLastError() ); ctx->cfCandForm[0].dwIndex = -1; @@ -6481,8 +6481,8 @@ static void test_ImmSetCandidateWindow(void) memset( &cand_form, 0xcd, sizeof(cand_form) ); ok_ret( 0, ImmGetCandidateWindow( himc, 0, &cand_form ) ); ok_eq( 0xcdcdcdcd, cand_form.dwStyle, UINT, "%#x" ); - todo_wine ok_ret( 1, ImmGetCandidateWindow( himc, 1, &cand_form ) ); - todo_wine check_candidate_form( &cand_form, &expect_form ); + ok_ret( 1, ImmGetCandidateWindow( himc, 1, &cand_form ) ); + check_candidate_form( &cand_form, &expect_form ); ok_ret( 1, ImmGetCandidateWindow( himc, 2, &cand_form ) ); check_candidate_form( &cand_form, &expect_form ); ok_seq( empty_sequence );

1 0

Mohamad Al-Jaf : widl: Add support for WinRT HANDLE parameter type.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 3b31e75395ec49899102a87b12351632489d03ea URL: https://gitlab.winehq.org/wine/wine/-/commit/3b31e75395ec49899102a87b123516… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Apr 8 21:18:48 2023 -0400 widl: Add support for WinRT HANDLE parameter type. Needed by windows.ui.composition.interop.idl. --- tools/widl/parser.y | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9b81f9521fa..b802f75874d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2481,8 +2481,12 @@ static void check_field_common(const type_t *container_type, break; } case TGT_POINTER: - type = type_pointer_get_ref_type(type); - more_to_do = TRUE; + if (type_get_type(type_pointer_get_ref_type(type)) != TYPE_VOID || + !type->name || strcmp(type->name, "HANDLE")) + { + type = type_pointer_get_ref_type(type); + more_to_do = TRUE; + } break; case TGT_ARRAY: type = type_array_get_element_type(type);

1 0

Mohamad Al-Jaf : include: Add windows.ui.composition.interop.idl file.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: a7569e3ee9c2cf2a1190d1f7d184761210b791ce URL: https://gitlab.winehq.org/wine/wine/-/commit/a7569e3ee9c2cf2a1190d1f7d18476… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Apr 8 20:21:20 2023 -0400 include: Add windows.ui.composition.interop.idl file. Needed for mingw Firefox build. --- include/Makefile.in | 1 + include/windows.ui.composition.interop.idl | 40 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index f52314e745d..54d6dca234d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -838,6 +838,7 @@ SOURCES = \ windows.system.threading.idl \ windows.system.userprofile.idl \ windows.ui.composition.idl \ + windows.ui.composition.interop.idl \ windows.ui.core.idl \ windows.ui.idl \ windows.ui.viewmanagement.idl \ diff --git a/include/windows.ui.composition.interop.idl b/include/windows.ui.composition.interop.idl new file mode 100644 index 00000000000..cde3e62f533 --- /dev/null +++ b/include/windows.ui.composition.interop.idl @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "windows.ui.composition.idl"; +import "sdkddkver.h"; + +namespace Windows.UI.Composition { + interface ICompositorInterop; + + [ + object, + uuid(25297d5c-3ad4-4c9c-b5cf-e36a38512330), + pointer_default(unique) + ] + interface ICompositorInterop : IInspectable + { + HRESULT CreateCompositionSurfaceForHandle([in] HANDLE swapchain, [out, retval] ICompositionSurface **result); + HRESULT CreateCompositionSurfaceForSwapChain([in] IUnknown *swapchain, [out, retval] ICompositionSurface **result); + HRESULT CreateGraphicsDevice([in] IUnknown *device, [out, retval] ICompositionGraphicsDevice **result); + }; +}

1 0

Piotr Caban : wineps: Don't write invisible parts of image to decrease output file size.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: ce3604bf58e298e2c56f7114df81887567a1889c URL: https://gitlab.winehq.org/wine/wine/-/commit/ce3604bf58e298e2c56f7114df8188… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:47:43 2023 +0200 wineps: Don't write invisible parts of image to decrease output file size. --- dlls/wineps.drv/printproc.c | 111 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index f4eb2fd9eb0..3b7de50985f 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -173,6 +173,111 @@ static inline void get_bounding_rect(RECT *rect, int x, int y, int width, int he } } +static inline void order_rect(RECT *rect) +{ + if (rect->left > rect->right) + { + int tmp = rect->left; + rect->left = rect->right; + rect->right = tmp; + } + if (rect->top > rect->bottom) + { + int tmp = rect->top; + rect->top = rect->bottom; + rect->bottom = tmp; + } +} + +static BOOL intersect_vis_rectangles(struct bitblt_coords *dst, struct bitblt_coords *src) +{ + RECT rect; + + /* intersect the rectangles */ + + if ((src->width == dst->width) && (src->height == dst->height)) /* no stretching */ + { + OffsetRect(&src->visrect, dst->x - src->x, dst->y - src->y); + if (!IntersectRect(&rect, &src->visrect, &dst->visrect)) return FALSE; + src->visrect = dst->visrect = rect; + OffsetRect(&src->visrect, src->x - dst->x, src->y - dst->y); + } + else /* stretching */ + { + /* map source rectangle into destination coordinates */ + rect = src->visrect; + OffsetRect(&rect, + -src->x - (src->width < 0 ? 1 : 0), + -src->y - (src->height < 0 ? 1 : 0)); + rect.left = rect.left * dst->width / src->width; + rect.top = rect.top * dst->height / src->height; + rect.right = rect.right * dst->width / src->width; + rect.bottom = rect.bottom * dst->height / src->height; + order_rect(&rect); + + /* when the source rectangle needs to flip and it doesn't fit in the source device + area, the destination area isn't flipped. So, adjust destination coordinates */ + if (src->width < 0 && dst->width > 0 && + (src->x + src->width + 1 < src->visrect.left || src->x > src->visrect.right)) + dst->x += (dst->width - rect.right) - rect.left; + else if (src->width > 0 && dst->width < 0 && + (src->x < src->visrect.left || src->x + src->width > src->visrect.right)) + dst->x -= rect.right - (dst->width - rect.left); + + if (src->height < 0 && dst->height > 0 && + (src->y + src->height + 1 < src->visrect.top || src->y > src->visrect.bottom)) + dst->y += (dst->height - rect.bottom) - rect.top; + else if (src->height > 0 && dst->height < 0 && + (src->y < src->visrect.top || src->y + src->height > src->visrect.bottom)) + dst->y -= rect.bottom - (dst->height - rect.top); + + OffsetRect(&rect, dst->x, dst->y); + + /* avoid rounding errors */ + rect.left--; + rect.top--; + rect.right++; + rect.bottom++; + if (!IntersectRect(&dst->visrect, &rect, &dst->visrect)) return FALSE; + + /* map destination rectangle back to source coordinates */ + rect = dst->visrect; + OffsetRect(&rect, + -dst->x - (dst->width < 0 ? 1 : 0), + -dst->y - (dst->height < 0 ? 1 : 0)); + rect.left = src->x + rect.left * src->width / dst->width; + rect.top = src->y + rect.top * src->height / dst->height; + rect.right = src->x + rect.right * src->width / dst->width; + rect.bottom = src->y + rect.bottom * src->height / dst->height; + order_rect(&rect); + + /* avoid rounding errors */ + rect.left--; + rect.top--; + rect.right++; + rect.bottom++; + if (!IntersectRect(&src->visrect, &rect, &src->visrect)) return FALSE; + } + return TRUE; +} + +static void clip_visrect(HDC hdc, RECT *dst, const RECT *src) +{ + HRGN hrgn; + + hrgn = CreateRectRgn(0, 0, 0, 0); + if (GetRandomRgn(hdc, hrgn, 3) == 1) + { + GetRgnBox(hrgn, dst); + IntersectRect(dst, dst, src); + } + else + { + *dst = *src; + } + DeleteObject(hrgn); +} + static void get_vis_rectangles(HDC hdc, struct bitblt_coords *dst, const XFORM *xform, DWORD width, DWORD height, struct bitblt_coords *src) { @@ -193,7 +298,7 @@ static void get_vis_rectangles(HDC hdc, struct bitblt_coords *dst, dst->width = -dst->width; } get_bounding_rect(&rect, dst->x, dst->y, dst->width, dst->height); - dst->visrect = rect; + clip_visrect(hdc, &dst->visrect, &rect); if (!src) return; @@ -206,8 +311,10 @@ static void get_vis_rectangles(HDC hdc, struct bitblt_coords *dst, src->y = rect.top; src->width = rect.right - rect.left; src->height = rect.bottom - rect.top; - get_bounding_rect( &rect, src->x, src->y, src->width, src->height ); + get_bounding_rect(&rect, src->x, src->y, src->width, src->height); src->visrect = rect; + + intersect_vis_rectangles(dst, src); } static int stretch_blt(PHYSDEV dev, const EMRSTRETCHBLT *blt,

1 0

Piotr Caban : wineps: Handle EMR_SELECTCLIPPATH in spool files.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 672088477f1bbb6a61d6b606ff587a69c3c00d3a URL: https://gitlab.winehq.org/wine/wine/-/commit/672088477f1bbb6a61d6b606ff587a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:43:16 2023 +0200 wineps: Handle EMR_SELECTCLIPPATH in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 3b7de50985f..a71f6a6aece 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1352,6 +1352,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEPEN: case EMR_CREATEBRUSHINDIRECT: case EMR_SETARCDIRECTION: + case EMR_SELECTCLIPPATH: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); default: FIXME("unsupported record: %ld\n", rec->iType);

1 0

Piotr Caban : wineps: Handle EMR_EXTSELECTCLIPRGN record in spool files.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 2929ce9b75c1b84f55cd519c30fc0d30d3d6fee5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2929ce9b75c1b84f55cd519c30fc0d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:44:13 2023 +0200 wineps: Handle EMR_EXTSELECTCLIPRGN record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index a71f6a6aece..a48b2d3c273 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1353,6 +1353,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEBRUSHINDIRECT: case EMR_SETARCDIRECTION: case EMR_SELECTCLIPPATH: + case EMR_EXTSELECTCLIPRGN: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); default: FIXME("unsupported record: %ld\n", rec->iType);

1 0

Piotr Caban : wineps: Fix reporting supported color depths in PSDRV_PutImage.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: d0e48343554ce6917b1a9ca64fb952b7e79f5bda URL: https://gitlab.winehq.org/wine/wine/-/commit/d0e48343554ce6917b1a9ca64fb952… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 12 13:42:03 2023 +0200 wineps: Fix reporting supported color depths in PSDRV_PutImage. --- dlls/wineps.drv/bitmap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index bafc86e9a24..59fbf1c1544 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -197,7 +197,8 @@ DWORD CDECL PSDRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, if (info->bmiHeader.biPlanes != 1) goto update_format; if (info->bmiHeader.biCompression != BI_RGB) goto update_format; - if (info->bmiHeader.biBitCount == 16 || info->bmiHeader.biBitCount == 32) goto update_format; + if (info->bmiHeader.biBitCount != 1 && info->bmiHeader.biBitCount != 4 && + info->bmiHeader.biBitCount != 8 && info->bmiHeader.biBitCount != 24) goto update_format; if (!bits) return ERROR_SUCCESS; /* just querying the format */ TRACE( "bpp %u %s -> %s\n", info->bmiHeader.biBitCount, wine_dbgstr_rect(&src->visrect), @@ -297,7 +298,9 @@ DWORD CDECL PSDRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, update_format: info->bmiHeader.biPlanes = 1; - if (info->bmiHeader.biBitCount > 8) info->bmiHeader.biBitCount = 24; + if (info->bmiHeader.biBitCount != 1 && info->bmiHeader.biBitCount != 4 && + info->bmiHeader.biBitCount != 8 && info->bmiHeader.biBitCount != 24) + info->bmiHeader.biBitCount = 24; info->bmiHeader.biCompression = BI_RGB; return ERROR_BAD_FORMAT; }

1 0