Use WM_CONTEXTMENU for shortcut menu. Thanks Thomas :)

[reactos.git] / reactos / subsys / system / servman / servman.c

diff --git a/reactos/subsys/system/servman/servman.c b/reactos/subsys/system/servman/servman.c
index 17503ed..dc10abe 100644 (file)
--- a/reactos/subsys/system/servman/servman.c
+++ b/reactos/subsys/system/servman/servman.c
@@ -236,17 +236,6 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 \r
             switch (((LPNMHDR) lParam)->code)\r
             {\r
-                case NM_RCLICK:\r
-                {\r
-                    //item = (LPNMITEMACTIVATE) lParam;\r
-                    //lpnmh = (LPNMHDR) lParam;\r
-                    POINT pt;\r
-\r
-                    GetCursorPos(&pt);\r
-                    TrackPopupMenuEx(hShortcutMenu, TPM_RIGHTBUTTON, pt.x, pt.y, hwnd, NULL);\r
-                }\r
-                break;\r
-\r
                    case NM_DBLCLK:\r
                     item = (LPNMITEMACTIVATE) lParam;\r
                     PropSheets(hwnd);\r
@@ -316,8 +305,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
         break;\r
 \r
            case WM_CLOSE:\r
-            /* free the service array */\r
-            FreeMemory();\r
+            FreeMemory(); /* free the service array */\r
             DestroyMenu(hShortcutMenu);\r
                    DestroyWindow(hwnd);\r
            break;\r
@@ -326,6 +314,17 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                    PostQuitMessage(0);\r
            break;\r
 \r
+        case WM_CONTEXTMENU:\r
+            {\r
+                int xPos, yPos;\r
+\r
+                xPos = LOWORD(lParam); \r
+                yPos = HIWORD(lParam);\r
+\r
+                TrackPopupMenuEx(hShortcutMenu, TPM_RIGHTBUTTON, xPos, yPos, hwnd, NULL);\r
+            }\r
+        break;\r
+\r
            case WM_COMMAND:\r
                    switch(LOWORD(wParam))\r
                    {\r