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

Jactry Zeng : comdlg32: Set a size for toolbar buttons of the file access dialog.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 3a59a4d1cd5f03c9ed92f09023f816a18a0b1b70 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a59a4d1cd5f03c9ed92f09023f816… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu May 18 02:02:52 2023 -0500 comdlg32: Set a size for toolbar buttons of the file access dialog. The default size is too small for HiDPI, so set the same height as the look-in combo box to it. And since in owner draw mode, the height of combo box is calculated and updated when drawing items, this patch set button height for toolbar from FILEDLG95_LOOKIN_DrawItem() too. --- dlls/comdlg32/filedlg.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 415c0580461..acb9b4f35a4 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -180,7 +180,7 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd); /* Functions used by the Look In combo box */ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo); -static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct); +static LRESULT FILEDLG95_LOOKIN_DrawItem(HWND hwnd, LPDRAWITEMSTRUCT pDIStruct); static BOOL FILEDLG95_LOOKIN_OnCommand(HWND hwnd, WORD wNotifyCode); static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId); static int FILEDLG95_LOOKIN_SearchItem(HWND hwnd,WPARAM searchArg,int iSearchMethod); @@ -1392,7 +1392,7 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l switch(((LPDRAWITEMSTRUCT)lParam)->CtlID) { case IDC_LOOKIN: - FILEDLG95_LOOKIN_DrawItem((LPDRAWITEMSTRUCT) lParam); + FILEDLG95_LOOKIN_DrawItem(hwnd, (LPDRAWITEMSTRUCT)lParam); return TRUE; } } @@ -3368,13 +3368,12 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) * * WM_DRAWITEM message handler */ -static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) +static LRESULT FILEDLG95_LOOKIN_DrawItem(HWND hwnd, LPDRAWITEMSTRUCT pDIStruct) { COLORREF crWin = GetSysColor(COLOR_WINDOW); COLORREF crHighLight = GetSysColor(COLOR_HIGHLIGHT); COLORREF crText = GetSysColor(COLOR_WINDOWTEXT); - RECT rectText; - RECT rectIcon; + RECT rectText, rectIcon, lookin_rect; SHFILEINFOW sfi; HIMAGELIST ilItemImage; int iIndentation; @@ -3382,6 +3381,8 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) LPSFOLDER tmpFolder; UINT shgfi_flags = SHGFI_PIDL | SHGFI_OPENICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME; UINT icon_width, icon_height; + FileOpenDlgInfos *dialog; + int height; TRACE("\n"); @@ -3452,6 +3453,12 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) /* Draw the associated text */ TextOutW(pDIStruct->hDC,rectText.left,rectText.top,sfi.szDisplayName,lstrlenW(sfi.szDisplayName)); + + dialog = get_filedlg_infoptr(hwnd); + GetWindowRect(dialog->DlgInfos.hwndLookInCB, &lookin_rect); + height = lookin_rect.bottom - lookin_rect.top; + SendMessageW(dialog->DlgInfos.hwndTB, TB_SETBUTTONSIZE, 0, MAKELPARAM(height, height)); + return NOERROR; }

1 0

Paul Gofman : wined3d: Only set changed.lights if wined3d_light_state_enable_light() changed state.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 45ee728dbb2f343f1e9f68e1c983c8eaf57e1680 URL: https://gitlab.winehq.org/wine/wine/-/commit/45ee728dbb2f343f1e9f68e1c983c8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 16 20:17:32 2023 -0600 wined3d: Only set changed.lights if wined3d_light_state_enable_light() changed state. --- dlls/wined3d/cs.c | 3 +-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 17 ++++++++++------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bca0b017c1f..f790e15cef0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2057,8 +2057,7 @@ static void wined3d_cs_exec_set_light_enable(struct wined3d_cs *cs, const void * } prev_idx = light_info->glIndex; - wined3d_light_state_enable_light(&cs->state.light_state, &device->adapter->d3d_info, light_info, op->enable); - if (light_info->glIndex != prev_idx) + if (wined3d_light_state_enable_light(&cs->state.light_state, &device->adapter->d3d_info, light_info, op->enable)) { device_invalidate_state(device, STATE_LIGHT_TYPE); device_invalidate_state(device, STATE_ACTIVELIGHT(op->enable ? light_info->glIndex : prev_idx)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index df186d9ffa2..775da5bac1f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1695,8 +1695,8 @@ static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT } } - wined3d_light_state_enable_light(light_state, &device->adapter->d3d_info, light_info, enable); - wined3d_device_context_emit_set_light_enable(&device->cs->c, light_idx, enable); + if (wined3d_light_state_enable_light(light_state, &device->adapter->d3d_info, light_info, enable)) + wined3d_device_context_emit_set_light_enable(&device->cs->c, light_idx, enable); } static HRESULT wined3d_device_set_clip_plane(struct wined3d_device *device, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 16f58b726d0..7b953fce234 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -634,7 +634,7 @@ HRESULT wined3d_light_state_set_light(struct wined3d_light_state *state, DWORD l return WINED3D_OK; } -void wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info, +bool wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info, struct wined3d_light_info *light_info, BOOL enable) { unsigned int light_count, i; @@ -644,18 +644,18 @@ void wined3d_light_state_enable_light(struct wined3d_light_state *state, const s if (light_info->glIndex == -1) { TRACE("Light already disabled, nothing to do.\n"); - return; + return false; } state->lights[light_info->glIndex] = NULL; light_info->glIndex = -1; - return; + return true; } if (light_info->glIndex != -1) { TRACE("Light already enabled, nothing to do.\n"); - return; + return false; } /* Find a free light. */ @@ -667,7 +667,7 @@ void wined3d_light_state_enable_light(struct wined3d_light_state *state, const s state->lights[i] = light_info; light_info->glIndex = i; - return; + return true; } /* Our tests show that Windows returns D3D_OK in this situation, even with @@ -677,6 +677,7 @@ void wined3d_light_state_enable_light(struct wined3d_light_state *state, const s * * TODO: Test how this affects rendering. */ WARN("Too many concurrently active lights.\n"); + return false; } static void wined3d_state_record_lights(struct wined3d_light_state *dst_state, @@ -1616,8 +1617,10 @@ HRESULT CDECL wined3d_stateblock_set_light_enable(struct wined3d_stateblock *sta if (FAILED(hr = wined3d_light_state_set_light(light_state, light_idx, &WINED3D_default_light, &light_info))) return hr; } - wined3d_light_state_enable_light(light_state, &stateblock->device->adapter->d3d_info, light_info, enable); - stateblock->changed.lights = 1; + + if (wined3d_light_state_enable_light(light_state, &stateblock->device->adapter->d3d_info, light_info, enable)) + stateblock->changed.lights = 1; + return S_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d28a86f77c2..a5296530fb5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5049,7 +5049,7 @@ void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, const struct wined3d_device *device, uint32_t flags) DECLSPEC_HIDDEN; void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN; -void wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info, +bool wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info, struct wined3d_light_info *light_info, BOOL enable) DECLSPEC_HIDDEN; struct wined3d_light_info *wined3d_light_state_get_light(const struct wined3d_light_state *state, unsigned int idx) DECLSPEC_HIDDEN;

1 0

Paul Gofman : wined3d: Track per light state changes in stateblock.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: debe2bd632cf1f545bca278658b3ba133a013067 URL: https://gitlab.winehq.org/wine/wine/-/commit/debe2bd632cf1f545bca278658b3ba… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 15 14:12:47 2023 -0600 wined3d: Track per light state changes in stateblock. --- dlls/wined3d/device.c | 17 ++++++++------- dlls/wined3d/stateblock.c | 48 ++++++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 45 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 775da5bac1f..f650f5be767 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3965,15 +3965,14 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if (changed->lights) { - for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) - { - const struct wined3d_light_info *light; + struct wined3d_light_info *light, *cursor; - LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) - { - wined3d_device_context_set_light(context, light->OriginalIndex, &light->OriginalParms); - wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); - } + LIST_FOR_EACH_ENTRY_SAFE(light, cursor, &changed->changed_lights, struct wined3d_light_info, changed_entry) + { + wined3d_device_context_set_light(context, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + list_remove(&light->changed_entry); + light->changed = false; } } @@ -4499,7 +4498,9 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); } + assert(list_empty(&stateblock->changed.changed_lights)); memset(&stateblock->changed, 0, sizeof(stateblock->changed)); + list_init(&stateblock->changed.changed_lights); TRACE("Applied stateblock %p.\n", stateblock); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 7b953fce234..6688889d6ff 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -340,8 +340,9 @@ void CDECL wined3d_stateblock_init_contained_states(struct wined3d_stateblock *s } } -static void stateblock_init_lights(struct list *dst_map, const struct list *src_map) +static void stateblock_init_lights(struct wined3d_stateblock *stateblock, const struct list *src_map) { + struct list *dst_map = stateblock->stateblock_state.light_state->light_map; unsigned int i; for (i = 0; i < LIGHTMAP_SIZE; ++i) @@ -354,6 +355,8 @@ static void stateblock_init_lights(struct list *dst_map, const struct list *src_ *dst_light = *src_light; list_add_tail(&dst_map[i], &dst_light->entry); + dst_light->changed = true; + list_add_tail(&stateblock->changed.changed_lights, &dst_light->changed_entry); } } } @@ -545,6 +548,8 @@ void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) { LIST_FOR_EACH_ENTRY_SAFE(light, cursor, &state->light_state->light_map[i], struct wined3d_light_info, entry) { + if (light->changed) + list_remove(&light->changed_entry); list_remove(&light->entry); heap_free(light); } @@ -570,6 +575,8 @@ void state_cleanup(struct wined3d_state *state) { struct wined3d_light_info *light = LIST_ENTRY(e1, struct wined3d_light_info, entry); list_remove(&light->entry); + if (light->changed) + list_remove(&light->changed_entry); heap_free(light); } } @@ -607,6 +614,16 @@ struct wined3d_light_info *wined3d_light_state_get_light(const struct wined3d_li return NULL; } +static void set_light_changed(struct wined3d_stateblock *stateblock, struct wined3d_light_info *light_info) +{ + if (!light_info->changed) + { + list_add_tail(&stateblock->changed.changed_lights, &light_info->changed_entry); + light_info->changed = true; + } + stateblock->changed.lights = 1; +} + HRESULT wined3d_light_state_set_light(struct wined3d_light_state *state, DWORD light_idx, const struct wined3d_light *params, struct wined3d_light_info **light_info) { @@ -1060,15 +1077,12 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, if (stateblock->changed.lights) { - for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) - { - const struct wined3d_light_info *light; + const struct wined3d_light_info *light; - LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) - { - wined3d_stateblock_set_light(device_state, light->OriginalIndex, &light->OriginalParms); - wined3d_stateblock_set_light_enable(device_state, light->OriginalIndex, light->glIndex != -1); - } + LIST_FOR_EACH_ENTRY(light, &stateblock->changed.changed_lights, struct wined3d_light_info, changed_entry) + { + wined3d_stateblock_set_light(device_state, light->OriginalIndex, &light->OriginalParms); + wined3d_stateblock_set_light_enable(device_state, light->OriginalIndex, light->glIndex != -1); } } @@ -1568,6 +1582,7 @@ HRESULT CDECL wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock UINT light_idx, const struct wined3d_light *light) { struct wined3d_light_info *object = NULL; + HRESULT hr; TRACE("stateblock %p, light_idx %u, light %p.\n", stateblock, light_idx, light); @@ -1600,8 +1615,9 @@ HRESULT CDECL wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock return WINED3DERR_INVALIDCALL; } - stateblock->changed.lights = 1; - return wined3d_light_state_set_light(stateblock->stateblock_state.light_state, light_idx, light, &object); + if (SUCCEEDED(hr = wined3d_light_state_set_light(stateblock->stateblock_state.light_state, light_idx, light, &object))) + set_light_changed(stateblock, object); + return hr; } HRESULT CDECL wined3d_stateblock_set_light_enable(struct wined3d_stateblock *stateblock, UINT light_idx, BOOL enable) @@ -1616,10 +1632,11 @@ HRESULT CDECL wined3d_stateblock_set_light_enable(struct wined3d_stateblock *sta { if (FAILED(hr = wined3d_light_state_set_light(light_state, light_idx, &WINED3D_default_light, &light_info))) return hr; + set_light_changed(stateblock, light_info); } if (wined3d_light_state_enable_light(light_state, &stateblock->device->adapter->d3d_info, light_info, enable)) - stateblock->changed.lights = 1; + set_light_changed(stateblock, light_info); return S_OK; } @@ -2008,6 +2025,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, const stru type == WINED3D_SBT_PRIMARY ? WINED3D_STATE_INIT_DEFAULT : 0); stateblock->changed.store_stream_offset = 1; + list_init(&stateblock->changed.changed_lights); if (type == WINED3D_SBT_RECORDED || type == WINED3D_SBT_PRIMARY) return WINED3D_OK; @@ -2017,8 +2035,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, const stru switch (type) { case WINED3D_SBT_ALL: - stateblock_init_lights(stateblock->stateblock_state.light_state->light_map, - device_state->stateblock_state.light_state->light_map); + stateblock_init_lights(stateblock, device_state->stateblock_state.light_state->light_map); stateblock_savedstates_set_all(&stateblock->changed, d3d_info->limits.vs_uniform_count, d3d_info->limits.ps_uniform_count); break; @@ -2029,8 +2046,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, const stru break; case WINED3D_SBT_VERTEX_STATE: - stateblock_init_lights(stateblock->stateblock_state.light_state->light_map, - device_state->stateblock_state.light_state->light_map); + stateblock_init_lights(stateblock, device_state->stateblock_state.light_state->light_map); stateblock_savedstates_set_vertex(&stateblock->changed, d3d_info->limits.vs_uniform_count); break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a5296530fb5..fc516319ec6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2992,6 +2992,8 @@ struct wined3d_light_info float cutoff; struct list entry; + struct list changed_entry; + bool changed; }; /* The default light parameters */ @@ -5016,6 +5018,8 @@ struct wined3d_saved_states DWORD lights : 1; DWORD transforms : 1; DWORD padding : 1; + + struct list changed_lights; }; struct StageState {

1 0

Paul Gofman : wined3d: Use RB tree for storing lights.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 71da110b4689d7fc8ca1439dfb7944146b6d8d9d URL: https://gitlab.winehq.org/wine/wine/-/commit/71da110b4689d7fc8ca1439dfb7944… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 16 21:12:24 2023 -0600 wined3d: Use RB tree for storing lights. --- dlls/wined3d/cs.c | 5 +- dlls/wined3d/device.c | 62 ++++++++--------- dlls/wined3d/stateblock.c | 155 +++++++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 8 +-- 4 files changed, 98 insertions(+), 132 deletions(-)

1 0

Bartosz Kosiorek : gdiplus: Limit calculating transformation points to resampling.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 66ebf9169ed5062e0a0a7585900f64af1b50bd00 URL: https://gitlab.winehq.org/wine/wine/-/commit/66ebf9169ed5062e0a0a7585900f64… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sun May 21 20:35:17 2023 +0200 gdiplus: Limit calculating transformation points to resampling. Calculating transformation points and not using it it is a waste of CPU time. With this patch the code was moved where it is used. It is improving performance of GdipDrawImagePointsRect when resampling is not needed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53947 --- dlls/gdiplus/graphics.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6831cfcb247..11dc06e6c9e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3152,14 +3152,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image GpRectF graphics_bounds; GpRect src_area; int i, x, y, src_stride, dst_stride; - GpMatrix dst_to_src; - REAL m11, m12, m21, m22, mdx, mdy; LPBYTE src_data, dst_data, dst_dyn_data=NULL; BitmapData lockeddata; InterpolationMode interpolation = graphics->interpolation; PixelOffsetMode offset_mode = graphics->pixeloffset; - GpPointF dst_to_src_points[3] = {{0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}}; - REAL x_dx, x_dy, y_dx, y_dy; static const GpImageAttributes defaultImageAttributes = {WrapModeClamp, 0, FALSE}; if (!imageAttributes) @@ -3187,18 +3183,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (IsRectEmpty(&dst_area)) return Ok; - m11 = (ptf[1].X - ptf[0].X) / srcwidth; - m21 = (ptf[2].X - ptf[0].X) / srcheight; - mdx = ptf[0].X - m11 * srcx - m21 * srcy; - m12 = (ptf[1].Y - ptf[0].Y) / srcwidth; - m22 = (ptf[2].Y - ptf[0].Y) / srcheight; - mdy = ptf[0].Y - m12 * srcx - m22 * srcy; - - GdipSetMatrixElements(&dst_to_src, m11, m12, m21, m22, mdx, mdy); - - stat = GdipInvertMatrix(&dst_to_src); - if (stat != Ok) return stat; - if (do_resampling) { get_bitmap_sample_size(interpolation, imageAttributes->wrap, @@ -3248,6 +3232,23 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (do_resampling) { + GpMatrix dst_to_src; + REAL m11, m12, m21, m22, mdx, mdy; + GpPointF dst_to_src_points[3] = {{0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}}; + REAL x_dx, x_dy, y_dx, y_dy; + + m11 = (ptf[1].X - ptf[0].X) / srcwidth; + m21 = (ptf[2].X - ptf[0].X) / srcheight; + m12 = (ptf[1].Y - ptf[0].Y) / srcwidth; + m22 = (ptf[2].Y - ptf[0].Y) / srcheight; + mdx = ptf[0].X - m11 * srcx - m21 * srcy; + mdy = ptf[0].Y - m12 * srcx - m22 * srcy; + + GdipSetMatrixElements(&dst_to_src, m11, m12, m21, m22, mdx, mdy); + + stat = GdipInvertMatrix(&dst_to_src); + if (stat != Ok) return stat; + /* Transform the bits as needed to the destination. */ dst_data = dst_dyn_data = heap_alloc_zero(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); if (!dst_data)

1 0

Bartosz Kosiorek : gdiplus: Use iterator instead calculate pointer position every time.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 9705fbd493c502a4ca32113ebeacaaf7d729f36a URL: https://gitlab.winehq.org/wine/wine/-/commit/9705fbd493c502a4ca32113ebeacaa… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sun May 21 20:35:28 2023 +0200 gdiplus: Use iterator instead calculate pointer position every time. With previous implementation, every iteration pointer value was calculated by taking row and column of the image. It needs multiply calculation. With current implementation, pointer value calculation, is replaced with iterator, which takes next pixel data. It improves efficiency by using addition instead of multiplication for iterating through points data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53947 --- dlls/gdiplus/graphics.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 11dc06e6c9e..04ac89ec128 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3236,6 +3236,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image REAL m11, m12, m21, m22, mdx, mdy; GpPointF dst_to_src_points[3] = {{0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}}; REAL x_dx, x_dy, y_dx, y_dy; + ARGB *dst_color; m11 = (ptf[1].X - ptf[0].X) / srcwidth; m21 = (ptf[2].X - ptf[0].X) / srcheight; @@ -3249,14 +3250,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image stat = GdipInvertMatrix(&dst_to_src); if (stat != Ok) return stat; - /* Transform the bits as needed to the destination. */ - dst_data = dst_dyn_data = heap_alloc_zero(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); - if (!dst_data) - { - heap_free(src_data); - return OutOfMemory; - } - dst_stride = sizeof(ARGB) * (dst_area.right - dst_area.left); GdipTransformMatrixPoints(&dst_to_src, dst_to_src_points, 3); @@ -3266,23 +3259,28 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image y_dx = dst_to_src_points[2].X - dst_to_src_points[0].X; y_dy = dst_to_src_points[2].Y - dst_to_src_points[0].Y; - for (x=dst_area.left; x<dst_area.right; x++) + /* Transform the bits as needed to the destination. */ + dst_data = dst_dyn_data = heap_alloc_zero(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); + if (!dst_data) { - for (y=dst_area.top; y<dst_area.bottom; y++) + heap_free(src_data); + return OutOfMemory; + } + + dst_color = (ARGB*)(dst_data); + for (y = dst_area.top; y < dst_area.bottom; y++) + { + for (x = dst_area.left; x < dst_area.right; x++) { GpPointF src_pointf; - ARGB *dst_color; - src_pointf.X = dst_to_src_points[0].X + x * x_dx + y * y_dx; src_pointf.Y = dst_to_src_points[0].Y + x * x_dy + y * y_dy; - dst_color = (ARGB*)(dst_data + dst_stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); - - if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && src_pointf.Y >= srcy && src_pointf.Y < srcy+srcheight) + if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && + src_pointf.Y >= srcy && src_pointf.Y < srcy + srcheight) *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, imageAttributes, interpolation, offset_mode); - else - *dst_color = 0; + dst_color++; } } }

1 0

Bartosz Kosiorek : gdiplus: Use float increment instead of calculation to impove perf.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 382603afa751469e5a14c8e3ac1398c3bccbae7c URL: https://gitlab.winehq.org/wine/wine/-/commit/382603afa751469e5a14c8e3ac1398… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sun May 21 20:35:32 2023 +0200 gdiplus: Use float increment instead of calculation to impove perf. Improves efficiency by using addition instead of float numbers multiplication for destination points. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53947 --- dlls/gdiplus/graphics.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 04ac89ec128..fb848ed8a9c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3237,6 +3237,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image GpPointF dst_to_src_points[3] = {{0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}}; REAL x_dx, x_dy, y_dx, y_dy; ARGB *dst_color; + GpPointF src_pointf_row, src_pointf; m11 = (ptf[1].X - ptf[0].X) / srcwidth; m21 = (ptf[2].X - ptf[0].X) / srcheight; @@ -3266,16 +3267,21 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image heap_free(src_data); return OutOfMemory; } - dst_color = (ARGB*)(dst_data); - for (y = dst_area.top; y < dst_area.bottom; y++) + + /* Calculate top left point of transformed image. + It would be used as reference point for adding */ + src_pointf_row.X = dst_to_src_points[0].X + + dst_area.left * x_dx + dst_area.top * y_dx; + src_pointf_row.Y = dst_to_src_points[0].Y + + dst_area.left * x_dy + dst_area.top * y_dy; + + for (y = dst_area.top; y < dst_area.bottom; + y++, src_pointf_row.X += y_dx, src_pointf_row.Y += y_dy) { - for (x = dst_area.left; x < dst_area.right; x++) + for (x = dst_area.left, src_pointf = src_pointf_row; x < dst_area.right; + x++, src_pointf.X += x_dx, src_pointf.Y += x_dy) { - GpPointF src_pointf; - src_pointf.X = dst_to_src_points[0].X + x * x_dx + y * y_dx; - src_pointf.Y = dst_to_src_points[0].Y + x * x_dy + y * y_dy; - if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && src_pointf.Y >= srcy && src_pointf.Y < srcy + srcheight) *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf,

1 0

Bartosz Kosiorek : gdiplus: Improve performance of DrawImagePointsRect by avoid TransformMatrixPoints.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: f898f206f63744a2cc696d2b9ef81b95816d31cd URL: https://gitlab.winehq.org/wine/wine/-/commit/f898f206f63744a2cc696d2b9ef81b… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue May 23 04:39:33 2023 +0200 gdiplus: Improve performance of DrawImagePointsRect by avoid TransformMatrixPoints. Using TransformMatrixPoints is not needed and all values could be taken from transformation matrix: - ShearX from m11, m12 - ShearY from m21, m22 - Translation mdx, mdy The result could be calculated by taking destination points values: {{0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}} and calculating it with GdipTransformMatrixPoints function: dst_to_src_points[0].X = dst_to_src.matrix[4]; dst_to_src_points[0].Y = dst_to_src.matrix[5]; dst_to_src_points[1].X = dst_to_src.matrix[0] + dst_to_src.matrix[4]; dst_to_src_points[1].Y = dst_to_src.matrix[1] + dst_to_src.matrix[5]; dst_to_src_points[2].X = dst_to_src.matrix[2] + dst_to_src.matrix[4]; dst_to_src_points[2].Y = dst_to_src.matrix[3] + dst_to_src.matrix[5]; --- dlls/gdiplus/graphics.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index fb848ed8a9c..03542b31ea7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3234,14 +3234,13 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image { GpMatrix dst_to_src; REAL m11, m12, m21, m22, mdx, mdy; - GpPointF dst_to_src_points[3] = {{0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}}; REAL x_dx, x_dy, y_dx, y_dy; ARGB *dst_color; GpPointF src_pointf_row, src_pointf; m11 = (ptf[1].X - ptf[0].X) / srcwidth; - m21 = (ptf[2].X - ptf[0].X) / srcheight; m12 = (ptf[1].Y - ptf[0].Y) / srcwidth; + m21 = (ptf[2].X - ptf[0].X) / srcheight; m22 = (ptf[2].Y - ptf[0].Y) / srcheight; mdx = ptf[0].X - m11 * srcx - m21 * srcy; mdy = ptf[0].Y - m12 * srcx - m22 * srcy; @@ -3252,13 +3251,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (stat != Ok) return stat; dst_stride = sizeof(ARGB) * (dst_area.right - dst_area.left); - - GdipTransformMatrixPoints(&dst_to_src, dst_to_src_points, 3); - - x_dx = dst_to_src_points[1].X - dst_to_src_points[0].X; - x_dy = dst_to_src_points[1].Y - dst_to_src_points[0].Y; - y_dx = dst_to_src_points[2].X - dst_to_src_points[0].X; - y_dy = dst_to_src_points[2].Y - dst_to_src_points[0].Y; + x_dx = dst_to_src.matrix[0]; + x_dy = dst_to_src.matrix[1]; + y_dx = dst_to_src.matrix[2]; + y_dy = dst_to_src.matrix[3]; /* Transform the bits as needed to the destination. */ dst_data = dst_dyn_data = heap_alloc_zero(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); @@ -3271,9 +3267,9 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image /* Calculate top left point of transformed image. It would be used as reference point for adding */ - src_pointf_row.X = dst_to_src_points[0].X + + src_pointf_row.X = dst_to_src.matrix[4] + dst_area.left * x_dx + dst_area.top * y_dx; - src_pointf_row.Y = dst_to_src_points[0].Y + + src_pointf_row.Y = dst_to_src.matrix[5] + dst_area.left * x_dy + dst_area.top * y_dy; for (y = dst_area.top; y < dst_area.bottom;

1 0

Nikolay Sivov : d2d1: Improve GetDC()/ReleaseDC() handling on render targets.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 6526de5c5a5c7d00d858410d146d8d03934c73b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/6526de5c5a5c7d00d858410d146d8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 22 21:54:38 2023 +0200 d2d1: Improve GetDC()/ReleaseDC() handling on render targets. --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/device.c | 23 +++++++++++++++++++---- dlls/d2d1/tests/d2d1.c | 22 +++++++++++++--------- 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e343c9998c1..f8dc9f9deb3 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -183,6 +183,7 @@ struct d2d_device_context struct d2d_bitmap *bitmap; struct d2d_command_list *command_list; }; + HDC hdc; } target; struct d2d_shape_resources shape_resources[D2D_SHAPE_TYPE_COUNT]; ID3D11Buffer *vs_cb; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 42db30b2888..6b230f717fe 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -3097,7 +3097,7 @@ static ULONG STDMETHODCALLTYPE d2d_gdi_interop_render_target_Release(ID2D1GdiInt return IUnknown_Release(render_target->outer_unknown); } -static HRESULT d2d_device_context_get_surface(struct d2d_device_context *context, IDXGISurface1 **surface) +static HRESULT d2d_gdi_interop_get_surface(struct d2d_device_context *context, IDXGISurface1 **surface) { ID3D11Resource *resource; HRESULT hr; @@ -3108,6 +3108,9 @@ static HRESULT d2d_device_context_get_surface(struct d2d_device_context *context return E_NOTIMPL; } + if (!(context->target.bitmap->options & D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE)) + return D2DERR_TARGET_NOT_GDI_COMPATIBLE; + ID3D11RenderTargetView_GetResource(context->target.bitmap->rtv, &resource); hr = ID3D11Resource_QueryInterface(resource, &IID_IDXGISurface1, (void **)surface); ID3D11Resource_Release(resource); @@ -3130,12 +3133,20 @@ static HRESULT STDMETHODCALLTYPE d2d_gdi_interop_render_target_GetDC(ID2D1GdiInt TRACE("iface %p, mode %d, dc %p.\n", iface, mode, dc); - if (FAILED(hr = d2d_device_context_get_surface(render_target, &surface))) + *dc = NULL; + + if (render_target->target.hdc) + return D2DERR_WRONG_STATE; + + if (FAILED(hr = d2d_gdi_interop_get_surface(render_target, &surface))) return hr; - hr = IDXGISurface1_GetDC(surface, mode != D2D1_DC_INITIALIZE_MODE_COPY, dc); + hr = IDXGISurface1_GetDC(surface, mode != D2D1_DC_INITIALIZE_MODE_COPY, &render_target->target.hdc); IDXGISurface1_Release(surface); + if (SUCCEEDED(hr)) + *dc = render_target->target.hdc; + return hr; } @@ -3149,9 +3160,13 @@ static HRESULT STDMETHODCALLTYPE d2d_gdi_interop_render_target_ReleaseDC(ID2D1Gd TRACE("iface %p, update rect %s.\n", iface, wine_dbgstr_rect(update)); - if (FAILED(hr = d2d_device_context_get_surface(render_target, &surface))) + if (!render_target->target.hdc) + return D2DERR_WRONG_STATE; + + if (FAILED(hr = d2d_gdi_interop_get_surface(render_target, &surface))) return hr; + render_target->target.hdc = NULL; if (update) update_rect = *update; hr = IDXGISurface1_ReleaseDC(surface, update ? &update_rect : NULL); diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ae0e36f1e17..b00d3fc7444 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6166,7 +6166,7 @@ static void test_dc_target_gdi_interop(BOOL d3d11) hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &hdc); todo_wine ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!hdc, "Got unexpected DC %p.\n", hdc); + ok(!hdc, "Got unexpected DC %p.\n", hdc); hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); @@ -6335,9 +6335,8 @@ static void test_hwnd_target_gdi_interop(BOOL d3d11) ID2D1HwndRenderTarget_BeginDraw(rt); dc = (void *)0xdeadbeef; hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); - todo_wine ok(hr == D2DERR_TARGET_NOT_GDI_COMPATIBLE, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!dc, "Got unexpected DC %p.\n", dc); + ok(!dc, "Got unexpected DC %p.\n", dc); hr = ID2D1HwndRenderTarget_EndDraw(rt, NULL, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID2D1GdiInteropRenderTarget_Release(interop); @@ -6441,9 +6440,10 @@ static void test_dxgi_surface_target_gdi_interop(BOOL d3d11) ID2D1RenderTarget_BeginDraw(rt); dc = (void *)0xdeadbeef; hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); - todo_wine ok(hr == D2DERR_TARGET_NOT_GDI_COMPATIBLE, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!dc, "Got unexpected DC %p.\n", dc); + ok(!dc, "Got unexpected DC %p.\n", dc); + hr = ID2D1GdiInteropRenderTarget_ReleaseDC(interop, NULL); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID2D1GdiInteropRenderTarget_Release(interop); @@ -6481,6 +6481,9 @@ static void test_dxgi_surface_target_gdi_interop(BOOL d3d11) hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!dc, "Got unexpected DC %p.\n", dc); + hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + ok(!dc, "Got unexpected DC %p.\n", dc); hr = ID2D1GdiInteropRenderTarget_ReleaseDC(interop, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); @@ -6499,8 +6502,10 @@ static void test_dxgi_surface_target_gdi_interop(BOOL d3d11) ID2D1RenderTarget_BeginDraw(rt); dc = (void *)0xdeadbeef; hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); - todo_wine ok(hr == D2DERR_TARGET_NOT_GDI_COMPATIBLE, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!dc, "Got unexpected DC %p.\n", dc); + ok(hr == D2DERR_TARGET_NOT_GDI_COMPATIBLE, "Got unexpected hr %#lx.\n", hr); + ok(!dc, "Got unexpected DC %p.\n", dc); + hr = ID2D1GdiInteropRenderTarget_ReleaseDC(interop, NULL); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID2D1GdiInteropRenderTarget_Release(interop); @@ -8781,9 +8786,8 @@ static void test_wic_gdi_interop(BOOL d3d11) ID2D1RenderTarget_BeginDraw(rt); dc = (void *)0xdeadbeef; hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); - todo_wine ok(hr == D2DERR_TARGET_NOT_GDI_COMPATIBLE, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!dc, "Got unexpected DC %p.\n", dc); + ok(!dc, "Got unexpected DC %p.\n", dc); ID2D1GdiInteropRenderTarget_Release(interop); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Nikolay Sivov : d2d1: Create GDI-compatible swapchain only for corresponding target usage.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: df7e680cd2ee52a8fabf9d59f9f0a6ad428249a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/df7e680cd2ee52a8fabf9d59f9f0a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 22 23:10:51 2023 +0200 d2d1: Create GDI-compatible swapchain only for corresponding target usage. --- dlls/d2d1/hwnd_render_target.c | 4 +++- dlls/d2d1/tests/d2d1.c | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index a62f31b909d..f176a25e956 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -889,7 +889,9 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target swapchain_desc.Windowed = TRUE; swapchain_desc.SwapEffect = hwnd_rt_desc->presentOptions & D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS ? DXGI_SWAP_EFFECT_SEQUENTIAL : DXGI_SWAP_EFFECT_DISCARD; - swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE; + swapchain_desc.Flags = 0; + if (desc->usage & D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE) + swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE; hr = IDXGIFactory_CreateSwapChain(dxgi_factory, (IUnknown *)d3d_device, &swapchain_desc, &render_target->swapchain); IDXGIFactory_Release(dxgi_factory); diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b00d3fc7444..3d8f82237a6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -13732,10 +13732,7 @@ static void test_hwnd_target_is_supported(BOOL d3d11) desc = template_desc; desc.pixelFormat = pixel_formats[i]; hr = ID2D1Factory_CreateHwndRenderTarget(ctx.factory, &desc, &hwnd_rt_desc, &rt); - todo_wine_if(i == 3 || i == 4 || i == 5) ok(hr == S_OK, "%u: unexpected hr %#lx.\n", i, hr); - if (FAILED(hr)) - continue; /* Resolve to default format. */ if (desc.pixelFormat.format == DXGI_FORMAT_UNKNOWN)

1 0