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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7315afbc13582d1171058705d21881906a77afe6
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7315afbc13582d1171058705d...

Author: Zhiyi Zhang 
Date:   Mon Feb 22 22:50:40 2021 +0800

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 
Signed-off-by: Alexandre Julliard

---

dlls/comctl32/ipaddress.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c
index 82d47d4e576..c7b9ada1f6a 100644
--- 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) {