- Wine-Commits - list.winehq.org

Sven Baars : kernelbase: Add support for shared registry keys.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 63c6b8931423472328a2a883276552a61fddf61d URL: https://gitlab.winehq.org/wine/wine/-/commit/63c6b8931423472328a2a883276552… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Nov 8 15:28:45 2022 +0100 kernelbase: Add support for shared registry keys. --- dlls/advapi32/tests/registry.c | 132 ++++++++++++++++++++--------------------- dlls/kernelbase/registry.c | 111 ++++++++++++++++++++++++++++++++-- 2 files changed, 171 insertions(+), 72 deletions(-)

1 0

Sven Baars : kernelbase: Recursively obtain the Wow6432Node parent.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: da0ec7fbbde45126320e15b2bfb00b357b45ffb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/da0ec7fbbde45126320e15b2bfb00b… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Nov 23 12:45:51 2022 +0100 kernelbase: Recursively obtain the Wow6432Node parent. --- dlls/advapi32/tests/registry.c | 60 ++++++++++++++++-------------------------- dlls/kernelbase/registry.c | 49 +++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 38 deletions(-)

1 0

Sven Baars : kernelbase: Don't open Wow6432nodes from create_key().
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 3609508c2fff93b2736dbb519fef37924d25f674 URL: https://gitlab.winehq.org/wine/wine/-/commit/3609508c2fff93b2736dbb519fef37… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Mar 17 17:14:37 2023 +0100 kernelbase: Don't open Wow6432nodes from create_key(). These can never exist in a newly created key. --- dlls/kernelbase/registry.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 63855eeb555..9fd1abceabb 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -303,19 +303,6 @@ static NTSTATUS create_key( HKEY *retkey, HKEY root, UNICODE_STRING name, ULONG while (i < len && buffer[i] == '\\') i++; buffer += i; len -= i; - - if (force_wow32) - { - name.Buffer = buffer; - name.Length = len * sizeof(WCHAR); - if (is_wow6432node( &name )) force_wow32 = FALSE; - else if ((subkey = open_wow6432node( attr.RootDirectory ))) - { - NtClose( attr.RootDirectory ); - attr.RootDirectory = subkey; - force_wow32 = FALSE; - } - } } } if (status == STATUS_PREDEFINED_HANDLE)

1 0

Sven Baars : kernelbase: Call create_key() from create_subkey().
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 3bbd37d0bbf047218e48b5e3b54b6e5df94caa90 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bbd37d0bbf047218e48b5e3b54b6e… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Mar 17 17:30:23 2023 +0100 kernelbase: Call create_key() from create_subkey(). --- dlls/kernelbase/registry.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index f9e647a026a..a69a87ebb3d 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -227,44 +227,28 @@ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING *name, DWORD o return status; } +static NTSTATUS create_key( HKEY *retkey, HKEY root, UNICODE_STRING name, ULONG options, ACCESS_MASK access, + const UNICODE_STRING *class, PULONG dispos ); + static NTSTATUS create_subkey( HKEY *subkey, HKEY root, UNICODE_STRING *name, DWORD options, ACCESS_MASK access, const UNICODE_STRING *class, PULONG dispos ) { + ACCESS_MASK access_64 = access & ~KEY_WOW64_32KEY; DWORD i = 0, len = name->Length / sizeof(WCHAR); WCHAR *buffer = name->Buffer; - OBJECT_ATTRIBUTES attr; UNICODE_STRING str; NTSTATUS status; - attr.Length = sizeof(attr); - attr.RootDirectory = root; - attr.ObjectName = &str; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - if (i < len && buffer[i] == '\\') return STATUS_OBJECT_PATH_INVALID; while (i < len && buffer[i] != '\\') i++; str.Buffer = name->Buffer; str.Length = i * sizeof(WCHAR); - if (i == len) - { - if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; - } - else - { + if (i < len) options &= ~REG_OPTION_CREATE_LINK; - } - - status = NtCreateKey( (HANDLE *)subkey, access, &attr, 0, class, options, dispos ); - if (status == STATUS_PREDEFINED_HANDLE) - { - *subkey = get_perflib_key( *subkey ); - status = STATUS_SUCCESS; - } + status = create_key( subkey, root, str, options, access_64, class, dispos ); if (!status) { while (i < len && buffer[i] == '\\') i++;

1 0

Piotr Caban : wineps: Handle EMR_SETVIEWPORTEXTEX in spool files.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: a18178dd293a3345632484ac6087c7f315d2038b URL: https://gitlab.winehq.org/wine/wine/-/commit/a18178dd293a3345632484ac6087c7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 11:56:45 2023 +0200 wineps: Handle EMR_SETVIEWPORTEXTEX 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 49d2a401e23..fd0d3cd2e90 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -515,6 +515,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_SETWINDOWEXTEX: case EMR_SETWINDOWORGEX: + case EMR_SETVIEWPORTEXTEX: case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM:

1 0

Piotr Caban : wineps: Handle EMR_SETARCDIRECTION record in spool files.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 83f0862b43f7b1b7bd23830b4339894c35febea7 URL: https://gitlab.winehq.org/wine/wine/-/commit/83f0862b43f7b1b7bd23830b433989… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 11:58:28 2023 +0200 wineps: Handle EMR_SETARCDIRECTION 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 572003613b9..6dc90ed99c0 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -521,6 +521,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM: + case EMR_SETARCDIRECTION: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); default: FIXME("unsupported record: %ld\n", rec->iType);

1 0

Piotr Caban : wineps: Handle EMR_BITBLT record in spool files.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: c3bd7c003ea3ce13d5e1c48efaed855994cc2216 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3bd7c003ea3ce13d5e1c48efaed85… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 12:01:36 2023 +0200 wineps: Handle EMR_BITBLT record in spool files. --- dlls/wineps.drv/printproc.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 39850af9311..22713229c26 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -493,6 +493,34 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, DeleteObject(rgn); return ret; } + case EMR_BITBLT: + { + const EMRBITBLT *p = (const EMRBITBLT *)rec; + const BITMAPINFO *bi = (const BITMAPINFO *)((BYTE *)p + p->offBmiSrc); + const BYTE *src_bits = (BYTE *)p + p->offBitsSrc; + EMRSTRETCHBLT blt; + + + blt.rclBounds = p->rclBounds; + blt.xDest = p->xDest; + blt.yDest = p->yDest; + blt.cxDest = p->cxDest; + blt.cyDest = p->cyDest; + blt.dwRop = p->dwRop; + blt.xSrc = p->xSrc; + blt.ySrc = p->ySrc; + blt.xformSrc = p->xformSrc; + blt.crBkColorSrc = p->crBkColorSrc; + blt.iUsageSrc = p->iUsageSrc; + blt.offBmiSrc = p->offBmiSrc; + blt.cbBmiSrc = p->cbBmiSrc; + blt.offBitsSrc = p->offBitsSrc; + blt.cbBitsSrc = p->cbBitsSrc; + blt.cxSrc = p->cxDest; + blt.cySrc = p->cyDest; + + return stretch_blt(&data->pdev->dev, &blt, bi, src_bits); + } case EMR_STRETCHBLT: { const EMRSTRETCHBLT *p = (const EMRSTRETCHBLT *)rec;

1 0

Piotr Caban : wineps: Handle EMR_SETBRUSHORGEX in spool files.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: ec2d0e9d8b53653fa895019109d4e3c2566edd84 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec2d0e9d8b53653fa895019109d4e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 11:57:52 2023 +0200 wineps: Handle EMR_SETBRUSHORGEX 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 0cdfebce0df..572003613b9 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -517,6 +517,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_SETWINDOWORGEX: case EMR_SETVIEWPORTEXTEX: case EMR_SETVIEWPORTORGEX: + case EMR_SETBRUSHORGEX: case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM:

1 0

Piotr Caban : wineps: Handle EMR_STRETCHBLT record in spool files.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: ab12be686ae61873f694e494288c6e195267ff1c URL: https://gitlab.winehq.org/wine/wine/-/commit/ab12be686ae61873f694e494288c6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 12:00:28 2023 +0200 wineps: Handle EMR_STRETCHBLT record in spool files. --- dlls/wineps.drv/printproc.c | 135 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 6dc90ed99c0..39850af9311 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -137,6 +137,133 @@ static inline INT GDI_ROUND(double val) return (int)floor(val + 0.5); } +static void translate(RECT *rect, const XFORM *xform) +{ + double x, y; + + x = rect->left; + y = rect->top; + rect->left = GDI_ROUND(x * xform->eM11 + y * xform->eM21 + xform->eDx); + rect->top = GDI_ROUND(x * xform->eM12 + y * xform->eM22 + xform->eDy); + + x = rect->right; + y = rect->bottom; + rect->right = GDI_ROUND(x * xform->eM11 + y * xform->eM21 + xform->eDx); + rect->bottom = GDI_ROUND(x * xform->eM12 + y * xform->eM22 + xform->eDy); +} + +static inline void get_bounding_rect(RECT *rect, int x, int y, int width, int height) +{ + rect->left = x; + rect->right = x + width; + rect->top = y; + rect->bottom = y + height; + if (rect->left > rect->right) + { + int tmp = rect->left; + rect->left = rect->right + 1; + rect->right = tmp + 1; + } + if (rect->top > rect->bottom) + { + int tmp = rect->top; + rect->top = rect->bottom + 1; + rect->bottom = tmp + 1; + } +} + +static void get_vis_rectangles(HDC hdc, struct bitblt_coords *dst, + const XFORM *xform, DWORD width, DWORD height, struct bitblt_coords *src) +{ + RECT rect; + + rect.left = dst->log_x; + rect.top = dst->log_y; + rect.right = dst->log_x + dst->log_width; + rect.bottom = dst->log_y + dst->log_height; + LPtoDP(hdc, (POINT *)&rect, 2); + dst->x = rect.left; + dst->y = rect.top; + dst->width = rect.right - rect.left; + dst->height = rect.bottom - rect.top; + if (dst->layout & LAYOUT_RTL && dst->layout & LAYOUT_BITMAPORIENTATIONPRESERVED) + { + dst->x += dst->width; + dst->width = -dst->width; + } + get_bounding_rect(&rect, dst->x, dst->y, dst->width, dst->height); + dst->visrect = rect; + + if (!src) return; + + rect.left = src->log_x; + rect.top = src->log_y; + rect.right = src->log_x + src->log_width; + rect.bottom = src->log_y + src->log_height; + translate(&rect, xform); + src->x = rect.left; + 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 ); + src->visrect = rect; +} + +static int stretch_blt(PHYSDEV dev, const EMRSTRETCHBLT *blt, + const BITMAPINFO *bi, const BYTE *src_bits) +{ + char dst_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *dst_info = (BITMAPINFO *)dst_buffer; + struct bitblt_coords src, dst; + struct gdi_image_bits bits; + DWORD err; + + dst.log_x = blt->xDest; + dst.log_y = blt->yDest; + dst.log_width = blt->cxDest; + dst.log_height = blt->cyDest; + dst.layout = GetLayout(dev->hdc); + if (blt->dwRop & NOMIRRORBITMAP) + dst.layout |= LAYOUT_BITMAPORIENTATIONPRESERVED; + + if (!blt->cbBmiSrc) + { + get_vis_rectangles(dev->hdc, &dst, NULL, 0, 0, NULL); + return PSDRV_PatBlt(dev, &dst, blt->dwRop); + } + + src.log_x = blt->xSrc; + src.log_y = blt->ySrc; + src.log_width = blt->cxSrc; + src.log_height = blt->cySrc; + src.layout = 0; + + get_vis_rectangles(dev->hdc, &dst, &blt->xformSrc, + bi->bmiHeader.biWidth, bi->bmiHeader.biHeight, &src); + + memcpy(dst_info, bi, blt->cbBmiSrc); + memset(&bits, 0, sizeof(bits)); + bits.ptr = (BYTE *)src_bits; + err = PSDRV_PutImage(dev, 0, dst_info, &bits, &src, &dst, blt->dwRop); + if (err == ERROR_BAD_FORMAT) + { + HDC hdc = CreateCompatibleDC(NULL); + HBITMAP bitmap; + + bits.is_copy = TRUE; + bitmap = CreateDIBSection(hdc, dst_info, DIB_RGB_COLORS, &bits.ptr, NULL, 0); + SetDIBits(hdc, bitmap, 0, bi->bmiHeader.biHeight, src_bits, bi, blt->iUsageSrc); + + err = PSDRV_PutImage(dev, 0, dst_info, &bits, &src, &dst, blt->dwRop); + DeleteObject(bitmap); + DeleteObject(hdc); + } + + if (err != ERROR_SUCCESS) + FIXME("PutImage returned %ld\n", err); + return !err; +} + static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, const ENHMETARECORD *rec, int n, LPARAM arg) { @@ -366,6 +493,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, DeleteObject(rgn); return ret; } + case EMR_STRETCHBLT: + { + const EMRSTRETCHBLT *p = (const EMRSTRETCHBLT *)rec; + const BITMAPINFO *bi = (const BITMAPINFO *)((BYTE *)p + p->offBmiSrc); + const BYTE *src_bits = (BYTE *)p + p->offBitsSrc; + + return stretch_blt(&data->pdev->dev, p, bi, src_bits); + } case EMR_POLYBEZIER16: { const EMRPOLYBEZIER16 *p = (const EMRPOLYBEZIER16 *)rec;

1 0

Piotr Caban : wineps: Handle EMR_SETVIEWPORTORGEX record in spool files.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: b4ce2902e04a3329db3ead5aced8004ea96558d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4ce2902e04a3329db3ead5aced800… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 11:57:21 2023 +0200 wineps: Handle EMR_SETVIEWPORTORGEX 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 fd0d3cd2e90..0cdfebce0df 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -516,6 +516,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_SETWINDOWEXTEX: case EMR_SETWINDOWORGEX: case EMR_SETVIEWPORTEXTEX: + case EMR_SETVIEWPORTORGEX: case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM:

1 0