diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c
index e3736fc13ef..0101ee2bf12 100644
--- a/dlls/user32/defwnd.c
+++ b/dlls/user32/defwnd.c
@@ -563,7 +563,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
         else if( wParam == VK_F10 )
         {
             if (GetKeyState(VK_SHIFT) & 0x8000)
-                SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(-1, -1) );
+                SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, -1 );
             iF10Key = 1;
         }
         else if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000))
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 96b9ccc8d2e..76fef3bd613 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -6910,7 +6910,7 @@ static const struct message WmShiftF10Seq[] = {
     { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 1 }, /* XP */
     { WM_SYSKEYDOWN, wparam|lparam, VK_F10, 1 },
     { WM_SYSKEYDOWN, sent|wparam|lparam, VK_F10, 0x00000001 },
-    { WM_CONTEXTMENU, sent|defwinproc|lparam, /*hwnd*/0, MAKELPARAM(-1, -1) },
+    { WM_CONTEXTMENU, sent|defwinproc|lparam, /*hwnd*/0, -1 },
     { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0xc0000001 }, /* XP */
     { WM_SYSKEYUP, wparam|lparam, VK_F10, 0xc0000001 },
     { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 },