comctl32/ipaddress: Only print an error when it actually occurs.

IPADDRESS_GetPartIndex() is also used for handling WM_KILLFOCUS and WM_SETFOCUS messages. In this case, it's actually expected that the window receiving or losing focus may not be a IP Address part window. Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comctl32/ipaddress: Only print an error when it actually occurs.
7315afbc · Zhiyi Zhang · Alexandre Julliard · a11ffeec · 7315afbc
Commit 7315afbc authored Feb 22, 2021 by Zhiyi Zhang Committed by Alexandre Julliard Feb 22, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

ipaddress.c dlls/comctl32/ipaddress.c +5 -2

No files found.
--- a/dlls/comctl32/ipaddress.c
+++ b/dlls/comctl32/ipaddress.c
@@ -130,7 +130,6 @@ static int IPADDRESS_GetPartIndex(const IPADDRESS_INFO *infoPtr, HWND hwnd)
    for (i = 0; i < 4; i++)
        if (infoPtr->Part[i].EditHwnd == hwnd) return i;
-    ERR("We subclassed the wrong window! (hwnd=%p)\n", hwnd);
    return -1;
 }
@@ -503,7 +502,11 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
    TRACE("(hwnd=%p msg=0x%x wparam=0x%lx lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
-    if ( (index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0) return 0;
+    if ((index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0)
+    {
+        ERR("We subclassed the wrong window! (hwnd=%p)\n", hwnd);
+        return 0;
+    }
    part = &infoPtr->Part[index];
    if (uMsg == WM_CHAR || uMsg == WM_KEYDOWN) {