May 2024 - Wine-Commits - list.winehq.org

Esme Povirk : gitlab: Add unzip to build image.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: d79eab977696545265df61115dbdce9fde4e6f26 URL: https://gitlab.winehq.org/wine/wine/-/commit/d79eab977696545265df61115dbdce… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 18 17:36:34 2024 +0000 gitlab: Add unzip to build image. I would like to reuse this build image for the Wine Mono CI process (so that I don't have to separately maintain an image that can run current Wine), but I need unzip to download and extract artifacts from Wine's CI process. --- tools/gitlab/image.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker index 4a380dfb51b..5259d1a1ed4 100644 --- a/tools/gitlab/image.docker +++ b/tools/gitlab/image.docker @@ -54,7 +54,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ unixodbc-dev:amd64 unixodbc-dev:i386 \ x11proto-dev && \ apt-get install -y ccache netbase curl ca-certificates xserver-xorg-video-dummy xserver-xorg xfonts-base xinit fvwm \ - winbind fonts-liberation2 fonts-noto-core fonts-noto-cjk pulseaudio && \ + winbind fonts-liberation2 fonts-noto-core fonts-noto-cjk pulseaudio unzip && \ curl -O https://www.deb-multimedia.org/pool/main/d/deb-multimedia-keyring/deb-multi… && \ dpkg -i deb-multimedia-keyring_2016.8.1_all.deb && \ echo 'deb https://www.deb-multimedia.org bookworm main' >> /etc/apt/sources.list && \

1 0

Esme Povirk : gdiplus: Bracket HDC use in GdipDrawString.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: d9d7e8f39228a9c5ae6bce2a90641f45a8f7e404 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9d7e8f39228a9c5ae6bce2a90641f… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 20:24:18 2024 +0000 gdiplus: Bracket HDC use in GdipDrawString. --- dlls/gdiplus/graphics.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b93b3f0c277..c089a984db7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5987,6 +5987,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, GDIPCONST GpBrush *brush) { + GpStatus status; HRGN rgn = NULL; HFONT gdifont; GpPointF rectcpy[4]; @@ -6005,9 +6006,11 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if(!graphics || !string || !font || !brush || !rect) return InvalidParameter; - if(graphics->hdc) + if(has_gdi_dc(graphics)) { - hdc = graphics->hdc; + status = gdi_dc_acquire(graphics, &hdc); + if (status != Ok) + return status; } else { @@ -6097,7 +6100,10 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string RestoreDC(hdc, save_state); - DeleteDC(temp_hdc); + if (temp_hdc) + DeleteDC(temp_hdc); + else + gdi_dc_release(graphics, hdc); return Ok; }

1 0

Esme Povirk : gdiplus: Bracket HDC use in GdipMeasureString.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: 9d30cddf064d799697bfb76cc5002cdf874776b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d30cddf064d799697bfb76cc5002c… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 20:13:28 2024 +0000 gdiplus: Bracket HDC use in GdipMeasureString. --- dlls/gdiplus/graphics.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a16932a31ab..b93b3f0c277 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5836,6 +5836,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, RectF *bounds, INT *codepointsfitted, INT *linesfilled) { + GpStatus status; HFONT oldfont, gdifont; struct measure_string_args args; HDC temp_hdc=NULL, hdc; @@ -5850,13 +5851,17 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(!graphics || !string || !font || !rect || !bounds) return InvalidParameter; - if(!graphics->hdc) + if(!has_gdi_dc(graphics)) { hdc = temp_hdc = CreateCompatibleDC(0); if (!temp_hdc) return OutOfMemory; } else - hdc = graphics->hdc; + { + status = gdi_dc_acquire(graphics, &hdc); + if (status != Ok) + return status; + } if(linesfilled) *linesfilled = 0; if(codepointsfitted) *codepointsfitted = 0; @@ -5909,6 +5914,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if (temp_hdc) DeleteDC(temp_hdc); + else + gdi_dc_release(graphics, hdc); return Ok; }

1 0

Esme Povirk : gdiplus: Bracket HDC use in GDI32_GdipDrawDriverString.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: 8b55affe3e6f9e85893bc11a55e980e8aa6d976d URL: https://gitlab.winehq.org/wine/wine/-/commit/8b55affe3e6f9e85893bc11a55e980… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 20:32:57 2024 +0000 gdiplus: Bracket HDC use in GDI32_GdipDrawDriverString. --- dlls/gdiplus/graphics.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c089a984db7..83fca7a9bfa 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -7492,6 +7492,7 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 LOGFONTW lfw; UINT eto_flags=0; GpStatus status; + HDC hdc; HRGN hrgn; if (!(flags & DriverStringOptionsCmapLookup)) @@ -7509,15 +7510,23 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 } } - save_state = SaveDC(graphics->hdc); - SetBkMode(graphics->hdc, TRANSPARENT); - SetTextColor(graphics->hdc, get_gdi_brush_color(brush)); + status = gdi_dc_acquire(graphics, &hdc); + if (status != Ok) + { + free(real_positions); + free(eto_positions); + return status; + } + + save_state = SaveDC(hdc); + SetBkMode(hdc, TRANSPARENT); + SetTextColor(hdc, get_gdi_brush_color(brush)); status = get_clip_hrgn(graphics, &hrgn); if (status == Ok) { - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); + ExtSelectClipRgn(hdc, hrgn, RGN_COPY); DeleteObject(hrgn); } @@ -7548,23 +7557,25 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 } } - SelectObject(graphics->hdc, hfont); + SelectObject(hdc, hfont); - SetTextAlign(graphics->hdc, TA_BASELINE|TA_LEFT); + SetTextAlign(hdc, TA_BASELINE|TA_LEFT); gdi_transform_acquire(graphics); - ExtTextOutW(graphics->hdc, gdip_round(pt.X), gdip_round(pt.Y), eto_flags, NULL, text, length, eto_positions); + ExtTextOutW(hdc, gdip_round(pt.X), gdip_round(pt.Y), eto_flags, NULL, text, length, eto_positions); gdi_transform_release(graphics); - RestoreDC(graphics->hdc, save_state); + RestoreDC(hdc, save_state); DeleteObject(hfont); free(real_positions); free(eto_positions); + gdi_dc_release(graphics, hdc); + return Ok; }

1 0

Esme Povirk : gdiplus: Bracket HDC use in GdipMeasureCharacterRanges.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: 8f20be4ab84c074b4130360c2f124e51cb8fbef1 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f20be4ab84c074b4130360c2f124e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 20:04:09 2024 +0000 gdiplus: Bracket HDC use in GdipMeasureCharacterRanges. --- dlls/gdiplus/graphics.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 87971180d2d..a16932a31ab 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5734,13 +5734,17 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (regionCount < stringFormat->range_count) return InvalidParameter; - if(!graphics->hdc) + if(!has_gdi_dc(graphics)) { hdc = temp_hdc = CreateCompatibleDC(0); if (!temp_hdc) return OutOfMemory; } else - hdc = graphics->hdc; + { + stat = gdi_dc_acquire(graphics, &hdc); + if (stat != Ok) + return stat; + } if (stringFormat->attr) TRACE("may be ignoring some format flags: attr %x\n", stringFormat->attr); @@ -5787,6 +5791,8 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (temp_hdc) DeleteDC(temp_hdc); + else + gdi_dc_release(graphics, hdc); return stat; }

1 0

Esme Povirk : gdiplus: Replace HDC check in GdipFlush.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: ab2931797cf03258df0b50717b03a5f7bad3c9ca URL: https://gitlab.winehq.org/wine/wine/-/commit/ab2931797cf03258df0b50717b03a5… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 19:54:34 2024 +0000 gdiplus: Replace HDC check in GdipFlush. --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4c12cc18f11..87971180d2d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4907,7 +4907,7 @@ GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) /* We have no internal operation queue, so there's no need to clear it. */ - if (graphics->hdc) + if (has_gdi_dc(graphics)) GdiFlush(); return Ok;

1 0

Paul Gofman : wine.inf: Add InstallationType field to CurrentVersion.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: c3d641927a3e54f35d454a83092b7d33fddd360e URL: https://gitlab.winehq.org/wine/wine/-/commit/c3d641927a3e54f35d454a83092b7d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 17 17:48:00 2024 -0600 wine.inf: Add InstallationType field to CurrentVersion. --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4aed3e73e06..256a24bc5a1 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2520,6 +2520,7 @@ HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%,"EditionId",2,"Professional" +HKLM,%CurrentVersionNT%,"InstallationType",2,"Client" HKLM,%CurrentVersionNT%,"ProductName",2,"Windows 10 Pro" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0

1 0

Tag wine-9.9 : Alexandre Julliard : Release 9.9
by Alexandre Julliard May 17, 2024

May 17, 2024

Module: wine Branch: refs/tags/wine-9.9 Tag: 2ff25b800c62468eb0ab8b03f1bb3cc743075ad1 URL: https://gitlab.winehq.org/wine/wine/-/tags/2ff25b800c62468eb0ab8b03f1bb3cc7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 22:10:05 2024 +0200 Release 9.9

1 0

Fabian Maurer : win32u: Only set scroll timer if it's not running.
by Alexandre Julliard May 17, 2024

May 17, 2024

Module: wine Branch: master Commit: 171e0adde5f9fc675b9f7d3ec10dae20cb4b0156 URL: https://gitlab.winehq.org/wine/wine/-/commit/171e0adde5f9fc675b9f7d3ec10dae… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed May 15 21:32:12 2024 +0200 win32u: Only set scroll timer if it's not running. This fixes a regression from bb496ea8 where we got a WM_MOUSEMOVE and this leads to skipping the initial scroll delay. Also closer mimics windows behavior, moving the mouse should not reset the scrolling timer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56582 --- dlls/win32u/scroll.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index 5ea35f1d908..f34fe80c7e6 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -62,6 +62,9 @@ static struct SCROLL_TRACKING_INFO g_tracking_info; /* Is the moving thumb being displayed? */ static BOOL scroll_moving_thumb = FALSE; +/* is there currently a running timer for scrolling delay ?*/ +static BOOL scroll_timer_running = FALSE; + /* data for window that has (one or two) scroll bars */ struct win_scroll_bar_info { @@ -516,15 +519,19 @@ void update_scroll_timer(HWND hwnd, HWND owner_hwnd, HWND ctl_hwnd, enum SCROLL_ { if (hittest == g_tracking_info.hit_test) { - if (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER) + if (!scroll_timer_running || msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER) { send_message( owner_hwnd, vertical ? WM_VSCROLL : WM_HSCROLL, msg_send, (LPARAM)ctl_hwnd ); + scroll_timer_running = TRUE; + NtUserSetSystemTimer( hwnd, SCROLL_TIMER, + msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); } - - NtUserSetSystemTimer( hwnd, SCROLL_TIMER, - msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); } - else NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); + else + { + scroll_timer_running = FALSE; + NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); + } } /*********************************************************************** @@ -789,6 +796,7 @@ void handle_scroll_event( HWND hwnd, int bar, UINT msg, POINT pt ) /* Terminate tracking */ g_tracking_info.win = 0; scroll_moving_thumb = FALSE; + scroll_timer_running = FALSE; hittest = SCROLL_NOWHERE; draw_scroll_bar( hwnd, hdc, bar, hittest, &g_tracking_info, TRUE, TRUE ); }

1 0

Huw Davies : maintainers: Remove Andrew Eikum.
by Alexandre Julliard May 17, 2024

May 17, 2024

Module: wine Branch: master Commit: 7a4a9983abe3452ba94d13379c255fdb49ea6229 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a4a9983abe3452ba94d13379c255f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 17 16:57:00 2024 +0100 maintainers: Remove Andrew Eikum. As discussed with Andrew privately. --- MAINTAINERS | 6 ------ 1 file changed, 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 22979d93ea1..d6631b1d69c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -37,7 +37,6 @@ F: dlls/ntdll/signal_arm* F: programs/winedbg/be_arm* Audio I/O -P: Andrew Eikum <coldpie(a)fastmail.com> P: Huw Davies <huw(a)codeweavers.com> F: dlls/dsound/ F: dlls/mmdevapi/ @@ -206,11 +205,6 @@ F: dlls/winexinput.sys/ F: dlls/winmm/joystick.c F: dlls/xinput*/ -Media format conversion -P: Andrew Eikum <coldpie(a)fastmail.com> -F: dlls/*.acm/ -F: dlls/msacm32/ - Media Foundation GStreamer backend M: Rémi Bernon <rbernon(a)codeweavers.com> P: Nikolay Sivov <nsivov(a)codeweavers.com>

1 0