[PATCH 1/9] comctl32/button: Use assignment instead of CopyRect

[Gabriel Ivăncescu]

Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---

These notes apply to the entire patch series (but each patch is independent).

Since patch 156187 was rejected and the reason for lack of including CopyRect
in that patch was "it makes no sense. A straight assignment should be used
instead", this patch series will do just that, and replace the remaining
CopyRect calls with straight assignments (and some NULL checks where needed).

To avoid redundant NULL checks, they have been added only to the rects that
can actually be NULL.

 dlls/comctl32/button.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c
index 56a4730..46e85a9 100644
--- a/dlls/comctl32/button.c
+++ b/dlls/comctl32/button.c
@@ -1362,9 +1362,9 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la
    }
    heap_free(text);
 
-   CopyRect(labelRc, &labelRect);
-   CopyRect(imageRc, &imageRect);
-   CopyRect(textRc, &textRect);
+   *labelRc = labelRect;
+   if (imageRc) *imageRc = imageRect;
+   if (textRc) *textRc = textRect;
 
    return dtStyle;
 }
-- 
2.19.1