From f8879f3de8db2c5cc51f15e5f5e2dc283fcf6c4b Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Sun, 9 Oct 2005 15:16:41 +0000
Subject: [PATCH] Fix for Bugzilla Entry 330: Correctly handle WM_COMMAND
 messages in web windows without web control

svn path=/trunk/; revision=18379
---
 .../subsys/system/explorer/shell/webchild.cpp | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/reactos/subsys/system/explorer/shell/webchild.cpp b/reactos/subsys/system/explorer/shell/webchild.cpp
index d77fdb6e92f..a4e4033df3d 100644
--- a/reactos/subsys/system/explorer/shell/webchild.cpp
+++ b/reactos/subsys/system/explorer/shell/webchild.cpp
@@ -247,46 +247,47 @@ LRESULT WebChildWindow::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
 			return TRUE;
 
  		  case PM_DISPATCH_COMMAND: {
-			if (_control) {
-				HRESULT hr = E_FAIL;
+			if (!_control)
+				return FALSE;
 
-				switch(LOWORD(wparam)) {
-				  case ID_GO_BACK:
-					hr = _control->GoBack();
-					break;
+			HRESULT hr = E_FAIL;
 
-				  case ID_GO_FORWARD:
-					hr = _control->GoForward();
-					break;
+			switch(LOWORD(wparam)) {
+			  case ID_GO_BACK:
+				hr = _control->GoBack();
+				break;
 
-				  case ID_GO_UP:
-					///@todo
-					break;
+			  case ID_GO_FORWARD:
+				hr = _control->GoForward();
+				break;
 
-				  case ID_GO_HOME:
-					hr = _control->GoHome();
-					break;
+			  case ID_GO_UP:
+				///@todo
+				break;
 
-				  case ID_GO_SEARCH:
-					hr = _control->GoSearch();
-					break;
+			  case ID_GO_HOME:
+				hr = _control->GoHome();
+				break;
 
-				  case ID_REFRESH:
-					hr = _control->Refresh();
-					break;
+			  case ID_GO_SEARCH:
+				hr = _control->GoSearch();
+				break;
 
-				  case ID_STOP:
-					hr = _control->Stop();
-					break;
+			  case ID_REFRESH:
+				hr = _control->Refresh();
+				break;
 
-				  default:
-					return super::WndProc(nmsg, wparam, lparam);
-				}
+			  case ID_STOP:
+				hr = _control->Stop();
+				break;
 
-				if (FAILED(hr) && hr!=E_FAIL)
-					THROW_EXCEPTION(hr);
+			  default:
+				return super::WndProc(nmsg, wparam, lparam);
 			}
 
+			if (FAILED(hr) && hr!=E_FAIL)
+				THROW_EXCEPTION(hr);
+
 			return TRUE;}
 
 		  default: