user32: Use straight assignments instead of CopyRect().
Michael Stefaniuc
mstefani at redhat.de
Tue Aug 2 12:09:01 CDT 2016
Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
---
RECT pointers are known to not be NULL.
dlls/user32/combo.c | 2 +-
dlls/user32/edit.c | 2 +-
dlls/user32/sysparams.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c
index c744ee5..a2e8b3c 100644
--- a/dlls/user32/combo.c
+++ b/dlls/user32/combo.c
@@ -777,7 +777,7 @@ static void CBPaintBorder(
}
else
{
- CopyRect(&clientRect, &lphc->textRect);
+ clientRect = lphc->textRect;
InflateRect(&clientRect, EDIT_CONTROL_PADDING(), EDIT_CONTROL_PADDING());
InflateRect(&clientRect, COMBO_XBORDERSIZE(), COMBO_YBORDERSIZE());
diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c
index 23139e9..46fda41 100644
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -4665,7 +4665,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B
case EM_GETRECT:
if (lParam)
- CopyRect((LPRECT)lParam, &es->format_rect);
+ *((LPRECT)lParam) = es->format_rect;
break;
case EM_SETRECT:
diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index a42a302..63c4ffe 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -1683,7 +1683,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam,
if (!pvParam) return FALSE;
spi_idx = SPI_SETWORKAREA_IDX;
- CopyRect( &work_area, pvParam );
+ work_area = *(RECT*)pvParam;
spi_loaded[spi_idx] = TRUE;
ret = TRUE;
break;
@@ -1702,7 +1702,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam,
EnumDisplayMonitors( 0, NULL, enum_monitors, (LPARAM)&work_area );
spi_loaded[spi_idx] = TRUE;
}
- CopyRect( pvParam, &work_area );
+ *(RECT*)pvParam = work_area;
ret = TRUE;
TRACE("work area %s\n", wine_dbgstr_rect( &work_area ));
break;
--
2.7.4
More information about the wine-patches
mailing list