From 7d31d39f001ed0aa4f276c8d4f560be018c2e7be Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Sun, 3 Jul 2011 10:19:21 +0400
Subject: [PATCH] comctl32/tab: Make WM_RBUTTONUP reach default window
 procedure.

---
 dlls/comctl32/tab.c       |  6 +++---
 dlls/comctl32/tests/tab.c | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index c2f2d25d1db..374d4ee2776 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -706,11 +706,10 @@ TAB_LButtonUp (const TAB_INFO *infoPtr)
   return 0;
 }
 
-static inline LRESULT
+static inline void
 TAB_RButtonUp (const TAB_INFO *infoPtr)
 {
   TAB_SendSimpleNotify(infoPtr, NM_RCLICK);
-  return 0;
 }
 
 /******************************************************************************
@@ -3430,7 +3429,8 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
       return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, wParam, lParam);
 
     case WM_RBUTTONUP:
-      return TAB_RButtonUp (infoPtr);
+      TAB_RButtonUp (infoPtr);
+      return DefWindowProcW (hwnd, uMsg, wParam, lParam);
 
     case WM_MOUSEMOVE:
       return TAB_MouseMove (infoPtr, wParam, lParam);
diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c
index c82f1287deb..36179dcbc47 100644
--- a/dlls/comctl32/tests/tab.c
+++ b/dlls/comctl32/tests/tab.c
@@ -286,6 +286,11 @@ static const struct message delete_focus_seq[] = {
     { 0 }
 };
 
+static const struct message rbuttonup_seq[] = {
+    { WM_RBUTTONUP, sent|wparam|lparam, 0, 0 },
+    { WM_CONTEXTMENU, sent|defwinproc },
+    { 0 }
+};
 
 static HWND
 create_tabcontrol (DWORD style, DWORD mask)
@@ -1407,6 +1412,22 @@ static void test_TCS_OWNERDRAWFIXED(void)
     DestroyWindow(hTab);
 }
 
+static void test_WM_CONTEXTMENU(void)
+{
+    HWND hTab;
+
+    hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, 4);
+    ok(hTab != NULL, "Failed to create tab control\n");
+
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    SendMessageA(hTab, WM_RBUTTONUP, 0, 0);
+
+    ok_sequence(sequences, TAB_SEQ_INDEX, rbuttonup_seq, "WM_RBUTTONUP response sequence", FALSE);
+
+    DestroyWindow(hTab);
+}
+
 START_TEST(tab)
 {
     LOGFONTA logfont;
@@ -1443,6 +1464,7 @@ START_TEST(tab)
     test_removeimage();
     test_TCM_SETITEMEXTRA();
     test_TCS_OWNERDRAWFIXED();
+    test_WM_CONTEXTMENU();
 
     DestroyWindow(parent_wnd);
 }
-- 
2.11.4.GIT