https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f076e5558f585eb8428aa...
commit 5f076e5558f585eb8428aa2b323eb2ed4d10bf00 Author: Serge Gautherie reactos-git_serge_171003@gautherie.fr AuthorDate: Tue Jun 9 02:52:17 2020 +0200 Commit: Thomas Faber thomas.faber@reactos.org CommitDate: Thu Jun 18 10:33:35 2020 +0200
[GDI32] MirrorRgnByWidth(): Fix 'phrgn' parameter handling
Detected by Cppcheck: uselessAssignmentPtrArg. Addendum to 794e7aa (r31523) and e647530 (r65893). --- win32ss/gdi/gdi32/objects/region.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/win32ss/gdi/gdi32/objects/region.c b/win32ss/gdi/gdi32/objects/region.c index 5ba168d9fdb..d7d2c330f73 100644 --- a/win32ss/gdi/gdi32/objects/region.c +++ b/win32ss/gdi/gdi32/objects/region.c @@ -85,7 +85,7 @@ FASTCALL MirrorRgnByWidth( _In_ HRGN hrgn, _In_ INT Width, - _In_ HRGN *phrgn) + _Out_opt_ HRGN *phrgn) { INT cRgnDSize, Ret = 0; PRGNDATA pRgnData; @@ -118,7 +118,10 @@ MirrorRgnByWidth( hRgnex = ExtCreateRegion(NULL, cRgnDSize , pRgnData); if (hRgnex) { - if (phrgn) phrgn = (HRGN *)hRgnex; + if (phrgn) + { + *phrgn = hRgnex; + } else { CombineRgn(hrgn, hRgnex, 0, RGN_COPY); @@ -138,7 +141,7 @@ WINAPI MirrorRgnDC( _In_ HDC hdc, _In_ HRGN hrgn, - _In_ HRGN *phrn) + _Out_opt_ HRGN *phrn) { if (!GdiValidateHandle((HGDIOBJ) hdc) || (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC))