Zebediah Figura : ddraw: Rename "is_complex_root" to "is_root".

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0fb06e8ac7eb362f28a0b029ea74c259f14fa9a6
URL:    https://gitlab.winehq.org/wine/wine/-/commit/0fb06e8ac7eb362f28a0b029ea74c25...

Author: Zebediah Figura 
Date:   Thu Dec 22 17:05:40 2022 -0600

ddraw: Rename "is_complex_root" to "is_root".

"is_complex_root" is somewhat misleading, given that it is TRUE for surfaces with no attached surfaces.

---

dlls/ddraw/ddraw_private.h |  2 +-
 dlls/ddraw/surface.c       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index 09e8133350b..e3fac63a38f 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -206,7 +206,7 @@ struct ddraw_surface
     /* You can't traverse the tree upwards. Only a flag for Surface::Release because it's needed there,
      * but no pointer to prevent temptations to traverse it in the wrong direction.
      */
-    unsigned int is_complex_root : 1;
+    unsigned int is_root : 1;
     unsigned int is_lost : 1;
     unsigned int sysmem_fallback : 1;

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index a7b3261fbdf..d7a3abc997a 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -579,7 +579,7 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface)

surf = surface->complex_array[i];
         surface->complex_array[i] = NULL;
-        if (!surf->is_complex_root)
+        if (!surf->is_root)
         {
             struct ddraw_texture *texture = wined3d_texture_get_parent(surf->wined3d_texture);
             struct wined3d_device *wined3d_device = texture->wined3d_device;
@@ -629,7 +629,7 @@ static ULONG ddraw_surface_release_iface(struct ddraw_surface *This)

/* Complex attached surfaces are destroyed implicitly when the root is released */
         wined3d_mutex_lock();
-        if(!This->is_complex_root)
+        if (!This->is_root)
         {
             WARN("(%p) Attempt to destroy a surface that is not a complex root\n", This);
             wined3d_mutex_unlock();
@@ -2628,7 +2628,7 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO
         WARN("Called on offscreenplain surface, returning DDERR_INVALIDOBJECT.\n");
         hr = DDERR_INVALIDOBJECT;
     }
-    else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->is_complex_root)
+    else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->is_root)
     {
         WARN("Called on non-managed texture or non-root surface, returning DDERR_INVALIDPARAMS.\n");
         hr = DDERR_INVALIDPARAMS;
@@ -5001,7 +5001,7 @@ static HRESULT ddraw_surface_set_color_key(struct ddraw_surface *surface, DWORD
         }
     }

-    if (surface->is_complex_root)
+    if (surface->is_root)
         hr = ddraw_surface_set_wined3d_textures_colour_key(surface, flags,
                 color_key ? (struct wined3d_color_key *)&fixed_color_key : NULL);

@@ -6641,7 +6641,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_

root = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0);

-    root->is_complex_root = TRUE;
+    root->is_root = TRUE;
     root->sysmem_fallback = sysmem_fallback;
     texture->root = root;
     wined3d_device_incref(texture->wined3d_device = ddraw->wined3d_device);