From 710bd6fb6a4b744bcead6b8aabc7e11e55948b0f Mon Sep 17 00:00:00 2001
From: Ulrich Czekalla <ulrich@codeweavers.com>
Date: Tue, 27 Jan 2004 20:11:05 +0000
Subject: [PATCH] We should forward WM_COMMAND notification to the active page
 for any additional non-standard controls in the property sheet frame.

---
 dlls/comctl32/propsheet.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index 87548046bce..c1b4a7c789d 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -2773,6 +2773,9 @@ static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID)
     case IDHELP:
 	PROPSHEET_Help(hwnd);
 	break;
+
+    default:
+        return FALSE;
     }
 
     return TRUE;
@@ -2901,7 +2904,18 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
       return TRUE;
 
     case WM_COMMAND:
-      return PROPSHEET_DoCommand(hwnd, LOWORD(wParam));
+      if (!PROPSHEET_DoCommand(hwnd, LOWORD(wParam)))
+      {
+          PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwnd, PropSheetInfoStr);
+
+          /* No default handler, forward notification to active page */
+          if (psInfo->activeValid && psInfo->active_page != -1)
+          {
+             HWND hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
+             SendMessageW(hwndPage, WM_COMMAND, wParam, lParam);
+          }
+      }
+      return TRUE;
 
     case WM_NOTIFY:
     {