Create a branch for header work.

[reactos.git] / base / applications / mscutils / servman / mainwnd.c

diff --git a/base/applications/mscutils/servman/mainwnd.c b/base/applications/mscutils/servman/mainwnd.c
index be918d7..d4534b9 100644 (file)
--- a/base/applications/mscutils/servman/mainwnd.c
+++ b/base/applications/mscutils/servman/mainwnd.c
@@ -288,8 +288,9 @@ pCreateToolbar(PMAIN_WND_INFO Info)
 
         hImageList = InitImageList(IDB_PROP,
                                    IDB_RESTART,
-                                   16,
-                                   16);
+                                   GetSystemMetrics(SM_CXSMICON),
+                                   GetSystemMetrics(SM_CXSMICON),
+                                   IMAGE_BITMAP);
         if (hImageList == NULL)
             return FALSE;
 
@@ -432,7 +433,7 @@ MainWndCommand(PMAIN_WND_INFO Info,
             ret = DialogBoxParam(hInstance,
                                  MAKEINTRESOURCE(IDD_DLG_CREATE),
                                  Info->hMainWnd,
-                                 (DLGPROC)CreateDialogProc,
+                                 CreateDialogProc,
                                  (LPARAM)Info);
             if (ret == IDOK)
                 RefreshServiceList(Info);
@@ -448,7 +449,7 @@ MainWndCommand(PMAIN_WND_INFO Info,
                 DialogBoxParam(hInstance,
                                MAKEINTRESOURCE(IDD_DLG_DELETE),
                                Info->hMainWnd,
-                               (DLGPROC)DeleteDialogProc,
+                               DeleteDialogProc,
                                (LPARAM)Info);
             }
             else
@@ -569,7 +570,7 @@ MainWndCommand(PMAIN_WND_INFO Info,
             DialogBox(hInstance,
                       MAKEINTRESOURCE(IDD_ABOUTBOX),
                       Info->hMainWnd,
-                      (DLGPROC)AboutDialogProc);
+                      AboutDialogProc);
             SetFocus(Info->hListView);
         break;
 
@@ -642,11 +643,14 @@ MainWndProc(HWND hwnd,
             if (!InitMainWnd(Info))
                 return -1;
 
+            /* Fill the list-view before showing the main window */
+            RefreshServiceList(Info);
+
             /* Show the window */
             ShowWindow(hwnd,
                        Info->nCmdShow);
 
-            RefreshServiceList(Info);
+            SetFocus(Info->hListView);
         }
         break;
 
@@ -685,6 +689,16 @@ MainWndProc(HWND hwnd,
                 }
                 break;
 
+                case NM_RETURN:
+                {
+                    SendMessage(hwnd,
+                                WM_COMMAND,
+                                //ID_PROP,
+                                MAKEWPARAM((WORD)ID_PROP, (WORD)0),
+                                0);
+                }
+                break;
+
                 case LVN_COLUMNCLICK:
                 {
                     LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam;
@@ -890,7 +904,7 @@ CreateMainWindow(LPCTSTR lpCaption,
                                   WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
                                   CW_USEDEFAULT,
                                   CW_USEDEFAULT,
-                                  650,
+                                  680,
                                   450,
                                   NULL,
                                   NULL,