Index: widget/src/windows/nsWindow.cpp
===================================================================
RCS file: /cvsroot/mozilla/widget/src/windows/nsWindow.cpp,v
retrieving revision 3.672
diff -u -8 -p -r3.672 nsWindow.cpp
--- widget/src/windows/nsWindow.cpp	19 Nov 2006 21:13:25 -0000	3.672
+++ widget/src/windows/nsWindow.cpp	21 Nov 2006 20:02:46 -0000
@@ -4655,31 +4655,30 @@ PRBool nsWindow::ProcessMessage(UINT msg
       DispatchMouseEvent(NS_MOUSE_EXIT, mouseState, MINLONG | MINSHORT);
     }
     break;
 #endif
 
     case WM_CONTEXTMENU:
     {
       // if the context menu is brought up from the keyboard, |lParam|
-      // will be maxlong. Send a different event msg instead.
-      PRUint32 msg;
+      // will be maxlong.
       LPARAM pos;
       PRBool contextMenukey = PR_FALSE;
-      msg = NS_CONTEXTMENU;
       if (lParam == 0xFFFFFFFF)
       {
         contextMenukey = PR_TRUE;
         pos = lParamToClient(GetMessagePos());
       }
       else
       {
         pos = lParamToClient(lParam);
       }
-      result = DispatchMouseEvent(msg, wParam, pos, contextMenukey);
+      result = DispatchMouseEvent(NS_CONTEXTMENU, wParam, pos, contextMenukey,
+                                  nsMouseEvent::eRightButton);
     }
     break;
 
     case WM_LBUTTONDBLCLK:
       result = DispatchMouseEvent(NS_MOUSE_DOUBLECLICK, wParam, lParam, PR_FALSE,
                                   nsMouseEvent::eLeftButton);
       break;