Zebediah Figura : quartz: Return the rect from get_default_rect() through a pointer.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 20b1ef6ed0f701e213b48cc148da0ae6101ba7d5
URL:    https://gitlab.winehq.org/wine/wine/-/commit/20b1ef6ed0f701e213b48cc148da0ae...

Author: Zebediah Figura 
Date:   Tue Dec  5 23:04:55 2023 -0600

quartz: Return the rect from get_default_rect() through a pointer.

Notably, this avoids the incorrect use of a static variable.

---

dlls/quartz/quartz_private.h |  2 +-
 dlls/quartz/videorenderer.c  |  9 +++------
 dlls/quartz/vmr9.c           | 11 ++++-------
 dlls/quartz/window.c         |  4 ++--
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h
index 849795d9c1b..58d8bb775a9 100644
--- a/dlls/quartz/quartz_private.h
+++ b/dlls/quartz/quartz_private.h
@@ -108,7 +108,7 @@ struct video_window

struct video_window_ops
 {
-    RECT (*get_default_rect)(struct video_window *window);
+    void (*get_default_rect)(struct video_window *window, RECT *rect);
     HRESULT (*get_current_image)(struct video_window *window, LONG *size, LONG *image);
 };

diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index f725a9998ce..e6735367cb3 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -199,14 +199,11 @@ static HRESULT video_renderer_connect(struct strmbase_renderer *iface, const AM_
     return S_OK;
 }

-static RECT video_renderer_get_default_rect(struct video_window *iface)
+static void video_renderer_get_default_rect(struct video_window *iface, RECT *rect)
 {
-    struct video_renderer *This = impl_from_video_window(iface);
-    static RECT defRect;
-
-    SetRect(&defRect, 0, 0, This->VideoWidth, This->VideoHeight);
+    struct video_renderer *filter = impl_from_video_window(iface);

-    return defRect;
+    SetRect(rect, 0, 0, filter->VideoWidth, filter->VideoHeight);
 }

static const struct strmbase_renderer_ops renderer_ops =
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index e34e6cee2ba..bc4ad4898f7 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -642,15 +642,12 @@ static const struct strmbase_renderer_ops renderer_ops =
     .renderer_pin_query_interface = vmr_pin_query_interface,
 };

-static RECT vmr_get_default_rect(struct video_window *This)
+static void vmr_get_default_rect(struct video_window *iface, RECT *rect)
 {
-    struct quartz_vmr *pVMR9 = impl_from_video_window(This);
-    const BITMAPINFOHEADER *bmiheader = get_filter_bitmap_header(pVMR9);
-    static RECT defRect;
-
-    SetRect(&defRect, 0, 0, bmiheader->biWidth, bmiheader->biHeight);
+    struct quartz_vmr *filter = impl_from_video_window(iface);
+    const BITMAPINFOHEADER *bitmap_header = get_filter_bitmap_header(filter);

-    return defRect;
+    SetRect(rect, 0, 0, bitmap_header->biWidth, bitmap_header->biHeight);
 }

static HRESULT vmr_get_current_image(struct video_window *iface, LONG *size, LONG *image)
diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c
index 4a9c4aed8f7..02c6a826bb2 100644
--- a/dlls/quartz/window.c
+++ b/dlls/quartz/window.c
@@ -655,7 +655,7 @@ HRESULT WINAPI BaseControlWindowImpl_GetMinIdealImageSize(IVideoWindow *iface, L

TRACE("window %p, width %p, height %p.\n", window, width, height);

-    rect = window->ops->get_default_rect(window);
+    window->ops->get_default_rect(window, &rect);
     *width = rect.right - rect.left;
     *height = rect.bottom - rect.top;
     return S_OK;
@@ -668,7 +668,7 @@ HRESULT WINAPI BaseControlWindowImpl_GetMaxIdealImageSize(IVideoWindow *iface, L

TRACE("window %p, width %p, height %p.\n", window, width, height);

-    rect = window->ops->get_default_rect(window);
+    window->ops->get_default_rect(window, &rect);
     *width = rect.right - rect.left;
     *height = rect.bottom - rect.top;
     return S_OK;