Avoid infinite loop in WINPOS_FindIconPos if the width of the parent

client area is less than the icon spacing.

Avoid infinite loop in WINPOS_FindIconPos if the width of the parent
be89816e · Huw D M Davies · Alexandre Julliard · c64ec4a9 · be89816e
Commit be89816e authored Dec 25, 1999 by Huw D M Davies Committed by Alexandre Julliard Dec 25, 1999
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

winpos.c windows/winpos.c +4 -2

No files found.
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -136,7 +136,8 @@ static POINT16 WINPOS_FindIconPos( WND* wndPtr, POINT16 pt )
    y = rectParent.bottom;
    for (;;)
    {
-        for (x = rectParent.left; x <= rectParent.right-xspacing; x += xspacing)
+        x = rectParent.left;
+        do 
        {
              /* Check if another icon already occupies this spot */
            WND *childPtr = WIN_LockWndPtr(wndPtr->parent->child);
@@ -159,7 +160,8 @@ static POINT16 WINPOS_FindIconPos( WND* wndPtr, POINT16 pt )
 		pt.y = y - (yspacing + GetSystemMetrics(SM_CYICON)) / 2;
 		return pt;
            }
-        }
+	    x += xspacing;
+        } while(x <= rectParent.right-xspacing);
        y -= yspacing;
    }
 }