WNDPROC handlers now check whether HWND argument is valid.

controls/button.c

@@ -407,12 +407,14 @@ static inline LRESULT WINAPI ButtonWndProc_locked(WND* wndPtr, UINT uMsg,
  */
 static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
-    LRESULT res;
+    LRESULT res = 0;
     WND *wndPtr = WIN_FindWndPtr(hWnd);
 
-    res = ButtonWndProc_locked(wndPtr,uMsg,wParam,lParam,TRUE);
-
-    WIN_ReleaseWndPtr(wndPtr);
+    if (wndPtr)
+    {
+        res = ButtonWndProc_locked(wndPtr,uMsg,wParam,lParam,TRUE);
+        WIN_ReleaseWndPtr(wndPtr);
+    }
     return res;
 }
 
@@ -422,12 +424,14 @@ static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
  */
 static LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
-    LRESULT res;
+    LRESULT res = 0;
     WND *wndPtr = WIN_FindWndPtr(hWnd);
 
-    res = ButtonWndProc_locked(wndPtr,uMsg,wParam,lParam,FALSE);
-
-    WIN_ReleaseWndPtr(wndPtr);
+    if (wndPtr)
+    {
+        res = ButtonWndProc_locked(wndPtr,uMsg,wParam,lParam,FALSE);
+        WIN_ReleaseWndPtr(wndPtr);
+    }
     return res;
 }
 

controls/combo.c

@@ -1863,7 +1863,6 @@ static void COMBO_MouseMove( LPHEADCOMBO lphc, WPARAM wParam, LPARAM lParam )
 static LRESULT ComboWndProc_locked( WND* pWnd, UINT message,
                                     WPARAM wParam, LPARAM lParam, BOOL unicode )
 {
-    if( pWnd ) {
       LPHEADCOMBO	lphc = CB_GETPTR(pWnd);
       HWND		hwnd = pWnd->hwndSelf;
 
@@ -2252,11 +2251,9 @@ static LRESULT ComboWndProc_locked( WND* pWnd, UINT message,
 		    WARN("unknown msg WM_USER+%04x wp=%04x lp=%08lx\n",
 			message - WM_USER, wParam, lParam );
 		break;
-    }
-    return unicode ? DefWindowProcW(hwnd, message, wParam, lParam) :
-		     DefWindowProcA(hwnd, message, wParam, lParam);
-  }
-  return CB_ERR;
+      }
+      return unicode ? DefWindowProcW(hwnd, message, wParam, lParam) :
+                       DefWindowProcA(hwnd, message, wParam, lParam);
 }
 
 /***********************************************************************
@@ -2267,10 +2264,14 @@ static LRESULT ComboWndProc_locked( WND* pWnd, UINT message,
  */
 static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam )
 {
-    WND*	pWnd = WIN_FindWndPtr(hwnd);
-    LRESULT retvalue = ComboWndProc_locked(pWnd, message, wParam, lParam, FALSE);
+    LRESULT retvalue = 0;
+    WND* pWnd = WIN_FindWndPtr(hwnd);
 
-    WIN_ReleaseWndPtr(pWnd);
+    if (pWnd)
+    {
+        retvalue = ComboWndProc_locked(pWnd, message, wParam, lParam, FALSE);
+        WIN_ReleaseWndPtr(pWnd);
+    }
     return retvalue;
 }
 
@@ -2279,9 +2280,13 @@ static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPA
  */
 static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam )
 {
-    WND*	pWnd = WIN_FindWndPtr(hwnd);
-    LRESULT retvalue = ComboWndProc_locked(pWnd, message, wParam, lParam, TRUE);
+    LRESULT retvalue = 0;
+    WND* pWnd = WIN_FindWndPtr(hwnd);
 
-    WIN_ReleaseWndPtr(pWnd);
+    if (pWnd)
+    {
+        retvalue = ComboWndProc_locked(pWnd, message, wParam, lParam, TRUE);
+        WIN_ReleaseWndPtr(pWnd);
+    }
     return retvalue;
 }

controls/edit.c

@@ -395,7 +395,7 @@ static LRESULT WINAPI EditWndProc_locked( WND *wnd, UINT msg,
 	switch (msg) {
 	case WM_DESTROY:
 		DPRINTF_EDIT_MSG32("WM_DESTROY");
-		EDIT_WM_Destroy(wnd, es);
+		if (es) EDIT_WM_Destroy(wnd, es);
                 result = 0;
                 goto END;
 
@@ -1121,12 +1121,14 @@ static LRESULT WINAPI EditWndProc_locked( WND *wnd, UINT msg,
  */
 LRESULT WINAPI EditWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    LRESULT res;
+    LRESULT res = 0;
     WND *wndPtr = WIN_FindWndPtr(hWnd);
 
-    res = EditWndProc_locked(wndPtr, uMsg, wParam, lParam, TRUE);
-
-    WIN_ReleaseWndPtr(wndPtr);
+    if (wndPtr)
+    {
+        res = EditWndProc_locked(wndPtr, uMsg, wParam, lParam, TRUE);
+        WIN_ReleaseWndPtr(wndPtr);
+    }
     return res;
 }
 
@@ -1136,12 +1138,14 @@ LRESULT WINAPI EditWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
  */
 LRESULT WINAPI EditWndProcA(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    LRESULT res;
+    LRESULT res = 0;
     WND *wndPtr = WIN_FindWndPtr(hWnd);
 
-    res = EditWndProc_locked(wndPtr, uMsg, wParam, lParam, FALSE);
-
-    WIN_ReleaseWndPtr(wndPtr);
+    if (wndPtr)
+    {
+        res = EditWndProc_locked(wndPtr, uMsg, wParam, lParam, FALSE);
+        WIN_ReleaseWndPtr(wndPtr);
+    }
     return res;
 }
 

controls/icontitle.c

@@ -200,6 +200,9 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg,
     LRESULT retvalue;
     WND *wnd = WIN_FindWndPtr( hWnd );
 
+    if( !wnd )
+      return 0;
+
     switch( msg )
     {
         case WM_CREATE:

controls/scroll.c

@@ -1125,6 +1125,8 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
  */
 static LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam )
 {
+    if (!IsWindow( hwnd )) return 0;
+
     switch(message)
     {
     case WM_CREATE:

controls/static.c

@@ -356,12 +356,14 @@ END:
  */
 static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
-    LRESULT lResult;
+    LRESULT lResult = 0;
     WND *wndPtr = WIN_FindWndPtr(hWnd);
 
-    lResult = StaticWndProc_locked(wndPtr, uMsg, wParam, lParam, FALSE);
-
-    WIN_ReleaseWndPtr(wndPtr);
+    if (wndPtr)
+    {
+        lResult = StaticWndProc_locked(wndPtr, uMsg, wParam, lParam, FALSE);
+        WIN_ReleaseWndPtr(wndPtr);
+    }
     return lResult;
 }
 
@@ -370,12 +372,14 @@ static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
  */
 static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
-    LRESULT lResult;
+    LRESULT lResult = 0;
     WND *wndPtr = WIN_FindWndPtr(hWnd);
 
-    lResult = StaticWndProc_locked(wndPtr, uMsg, wParam, lParam, TRUE);
-
-    WIN_ReleaseWndPtr(wndPtr);
+    if (wndPtr)
+    {
+        lResult = StaticWndProc_locked(wndPtr, uMsg, wParam, lParam, TRUE);
+        WIN_ReleaseWndPtr(wndPtr);
+    }
     return lResult;
 }