[ros-diffs] [cwittich] 19212: did some work on msconfig

did some work on msconfig
Modified: trunk/reactos/subsys/system/msconfig/De.rc
Modified: trunk/reactos/subsys/system/msconfig/En.rc
Added: trunk/reactos/subsys/system/msconfig/freeldrpage.c
Added: trunk/reactos/subsys/system/msconfig/freeldrpage.h
Added: trunk/reactos/subsys/system/msconfig/generalpage.c
Added: trunk/reactos/subsys/system/msconfig/generalpage.h
Modified: trunk/reactos/subsys/system/msconfig/msconfig.c
Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml
Modified: trunk/reactos/subsys/system/msconfig/precomp.h
Modified: trunk/reactos/subsys/system/msconfig/resource.h
Modified: trunk/reactos/subsys/system/msconfig/srvpage.c
Added: trunk/reactos/subsys/system/msconfig/systempage.c
Added: trunk/reactos/subsys/system/msconfig/systempage.h
  _____  

Modified: trunk/reactos/subsys/system/msconfig/De.rc
--- trunk/reactos/subsys/system/msconfig/De.rc	2005-11-13 19:05:01 UTC
(rev 19211)
+++ trunk/reactos/subsys/system/msconfig/De.rc	2005-11-13 20:58:29 UTC
(rev 19212)
@@ -27,18 +27,23 @@

 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "Tahoma"
 BEGIN
-    CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360,
168
+    CONTROL         "List3",IDC_STARTUP_LIST, "SysListView32",
LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,
2, 1, 360, 148
+    PUSHBUTTON      "Alle
&aktivieren",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
+    PUSHBUTTON      "Alle
&deaktivieren",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14
 END
 
 IDD_SERVICES_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "Tahoma"
 BEGIN
-    CONTROL "List1",IDC_SERVICES_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER |
WS_TABSTOP, 2, 1, 360, 168
+    CONTROL
"List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL
|
LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER |
WS_TABSTOP,2,1,360,148
+    PUSHBUTTON      "Alle
&aktivieren",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14
+    PUSHBUTTON      "Alle
&deaktivieren",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_MSCONFIG             "Systemkonfigurationsprogramm"
     IDS_TAB_GENERAL          "Allgemein"
     IDS_TAB_SYSTEM           "SYSTEM.INI"
     IDS_TAB_FREELDR          "FREELDR.INI"   
@@ -87,7 +92,7 @@
 BEGIN
     IDS_SERVICES_STATUS_RUNNING "Gestartet"
     IDS_SERVICES_STATUS_STOPPED "Beendet"
-    IDS_YES "Ja"
-    IDS_NO  "Nein"
+    IDS_SERVICES_YES "Ja"
+    IDS_SERVICES_UNKNOWN "Unbekannt" 
 END
 
  _____  

Modified: trunk/reactos/subsys/system/msconfig/En.rc
--- trunk/reactos/subsys/system/msconfig/En.rc	2005-11-13 19:05:01 UTC
(rev 19211)
+++ trunk/reactos/subsys/system/msconfig/En.rc	2005-11-13 20:58:29 UTC
(rev 19212)
@@ -18,7 +18,9 @@

 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "Tahoma"
 BEGIN
-    CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360,
168
+    CONTROL         "List3",IDC_STARTUP_LIST, "SysListView32",
LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,
2, 1, 360, 148
+    PUSHBUTTON      "&Activate
all",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
+    PUSHBUTTON      "&Deactivate
all",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14
 END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
@@ -34,11 +36,14 @@
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "Tahoma"
 BEGIN
-    CONTROL "List1",IDC_SERVICES_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER |
WS_TABSTOP, 2, 1, 360, 168
+    CONTROL
"List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL
|
LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER |
WS_TABSTOP,2,1,360,148
+    PUSHBUTTON      "&Activate
all",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14
+    PUSHBUTTON      "&Deactivate
all",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_MSCONFIG             "Systemkonfigurationsprogramm"
     IDS_TAB_GENERAL          "General"
     IDS_TAB_SYSTEM           "SYSTEM.INI"
     IDS_TAB_FREELDR          "FREELDR.INI"   
@@ -86,6 +91,6 @@
 BEGIN
     IDS_SERVICES_STATUS_RUNNING "Running"
     IDS_SERVICES_STATUS_STOPPED "Stopped"
-    IDS_YES "Yes"
-    IDS_NO  "No"
+    IDS_SERVICES_YES "Yes"
+    IDS_SERVICES_UNKNOWN "Unknown" 
 END
  _____  

Added: trunk/reactos/subsys/system/msconfig/freeldrpage.c
--- trunk/reactos/subsys/system/msconfig/freeldrpage.c	2005-11-13
19:05:01 UTC (rev 19211)
+++ trunk/reactos/subsys/system/msconfig/freeldrpage.c	2005-11-13
20:58:29 UTC (rev 19212)
@@ -0,0 +1,17 @@

+#include <precomp.h>
+
+HWND hFreeLdrPage;
+HWND hFreeLdrDialog;
+
+INT_PTR CALLBACK
+FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
lParam)
+{
+    switch (message) {
+    case WM_INITDIALOG:
+        hFreeLdrDialog = hDlg;
+	    SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE |
SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
+		return TRUE;
+	}
+
+  return 0;
+}
Property changes on: trunk/reactos/subsys/system/msconfig/freeldrpage.c
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Added: trunk/reactos/subsys/system/msconfig/freeldrpage.h
--- trunk/reactos/subsys/system/msconfig/freeldrpage.h	2005-11-13
19:05:01 UTC (rev 19211)
+++ trunk/reactos/subsys/system/msconfig/freeldrpage.h	2005-11-13
20:58:29 UTC (rev 19212)
@@ -0,0 +1,3 @@

+extern HWND hFreeLdrPage;
+
+INT_PTR CALLBACK FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM
wParam, LPARAM lParam);
Property changes on: trunk/reactos/subsys/system/msconfig/freeldrpage.h
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Added: trunk/reactos/subsys/system/msconfig/generalpage.c
--- trunk/reactos/subsys/system/msconfig/generalpage.c	2005-11-13
19:05:01 UTC (rev 19211)
+++ trunk/reactos/subsys/system/msconfig/generalpage.c	2005-11-13
20:58:29 UTC (rev 19212)
@@ -0,0 +1,17 @@

+#include <precomp.h>
+
+HWND hGeneralPage;
+HWND hGeneralDialog;
+
+INT_PTR CALLBACK
+GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
lParam)
+{
+    switch (message) {
+    case WM_INITDIALOG:
+        hGeneralDialog = hDlg;
+	    SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE |
SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
+		return TRUE;
+	}
+
+  return 0;
+}
Property changes on: trunk/reactos/subsys/system/msconfig/generalpage.c
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Added: trunk/reactos/subsys/system/msconfig/generalpage.h
--- trunk/reactos/subsys/system/msconfig/generalpage.h	2005-11-13
19:05:01 UTC (rev 19211)
+++ trunk/reactos/subsys/system/msconfig/generalpage.h	2005-11-13
20:58:29 UTC (rev 19212)
@@ -0,0 +1,3 @@

+extern HWND hGeneralPage;
+
+INT_PTR CALLBACK GeneralPageWndProc(HWND hDlg, UINT message, WPARAM
wParam, LPARAM lParam);
Property changes on: trunk/reactos/subsys/system/msconfig/generalpage.h
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Modified: trunk/reactos/subsys/system/msconfig/msconfig.c
--- trunk/reactos/subsys/system/msconfig/msconfig.c	2005-11-13
19:05:01 UTC (rev 19211)
+++ trunk/reactos/subsys/system/msconfig/msconfig.c	2005-11-13
20:58:29 UTC (rev 19212)
@@ -12,10 +12,16 @@

 	TCITEM  item;
 
 	hTabWnd = GetDlgItem(hWnd, IDC_TAB);
-    hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE),
hWnd, ToolsPageWndProc);
+    hGeneralPage = CreateDialog(hInst,
MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, GeneralPageWndProc);
+    hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE),
hWnd, SystemPageWndProc);
+    hFreeLdrPage = CreateDialog(hInst,
MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, FreeLdrPageWndProc);
     hServicesPage = CreateDialog(hInst,
MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc);
     hStartupPage = CreateDialog(hInst,
MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, StartupPageWndProc);
+    hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE),
hWnd, ToolsPageWndProc);
 
+    LoadString(hInst, IDS_MSCONFIG, szTemp, 256);
+    SetWindowText(hWnd, szTemp);
+
 	// Insert Tab Pages
 	LoadString(hInst, IDS_TAB_GENERAL, szTemp, 256);
     memset(&item, 0, sizeof(TCITEM));
@@ -61,45 +67,57 @@
 {
     switch (TabCtrl_GetCurSel(hTabWnd)) {
     case 0: //General
+        ShowWindow(hGeneralPage, SW_SHOW);
+        ShowWindow(hSystemPage, SW_HIDE);
+		ShowWindow(hFreeLdrPage, SW_HIDE);
+		ShowWindow(hServicesPage, SW_HIDE);
+		ShowWindow(hStartupPage, SW_HIDE);
         ShowWindow(hToolsPage, SW_HIDE);
-		ShowWindow(hStartupPage, SW_HIDE);
-		//ShowWindow(hFreeLdrPage, SW_HIDE);
-		ShowWindow(hServicesPage, SW_HIDE);
-        //BringWindowToTop(hFreeLdrPage);
+        BringWindowToTop(hGeneralPage);
 		break;
     case 1: //SYSTEM.INI
+        ShowWindow(hGeneralPage, SW_HIDE);
+        ShowWindow(hSystemPage, SW_SHOW);
         ShowWindow(hToolsPage, SW_HIDE);
 		ShowWindow(hStartupPage, SW_HIDE);
-		//ShowWindow(hFreeLdrPage, SW_SHOW);
+		ShowWindow(hFreeLdrPage, SW_HIDE);
 		ShowWindow(hServicesPage, SW_HIDE);
-        //BringWindowToTop(hFreeLdrPage);
+        BringWindowToTop(hSystemPage);
 		break;
     case 2: //Freeldr
+        ShowWindow(hGeneralPage, SW_HIDE);
+        ShowWindow(hSystemPage, SW_HIDE);
+		ShowWindow(hFreeLdrPage, SW_SHOW);
+		ShowWindow(hServicesPage, SW_HIDE);
+		ShowWindow(hStartupPage, SW_HIDE);
         ShowWindow(hToolsPage, SW_HIDE);
-		ShowWindow(hStartupPage, SW_HIDE);
-		//ShowWindow(hFreeLdrPage, SW_SHOW);
-		ShowWindow(hServicesPage, SW_HIDE);
-        //BringWindowToTop(hFreeLdrPage);
+        BringWindowToTop(hFreeLdrPage);
 		break;
     case 3: //Services
+        ShowWindow(hGeneralPage, SW_HIDE);
+        ShowWindow(hSystemPage, SW_HIDE);
+		ShowWindow(hFreeLdrPage, SW_HIDE);
+		ShowWindow(hServicesPage, SW_SHOW);
+		ShowWindow(hStartupPage, SW_HIDE);
         ShowWindow(hToolsPage, SW_HIDE);
-		ShowWindow(hStartupPage, SW_HIDE);
-		//ShowWindow(hFreeLdrPage, SW_HIDE);
-		ShowWindow(hServicesPage, SW_SHOW);
         BringWindowToTop(hServicesPage);
 		break;
     case 4: //startup
+        ShowWindow(hGeneralPage, SW_HIDE);
+        ShowWindow(hSystemPage, SW_HIDE);
+		ShowWindow(hFreeLdrPage, SW_HIDE);
+		ShowWindow(hServicesPage, SW_HIDE);
+		ShowWindow(hStartupPage, SW_SHOW);
         ShowWindow(hToolsPage, SW_HIDE);
-		ShowWindow(hStartupPage, SW_SHOW);
-		//ShowWindow(hFreeLdrPage, SW_HIDE);
-		ShowWindow(hServicesPage, SW_HIDE);
         BringWindowToTop(hStartupPage);
 		break;
 	case 5: //Tools
+        ShowWindow(hGeneralPage, SW_HIDE);
+        ShowWindow(hSystemPage, SW_HIDE);
+		ShowWindow(hFreeLdrPage, SW_HIDE);
+		ShowWindow(hServicesPage, SW_HIDE);
+		ShowWindow(hStartupPage, SW_HIDE);
         ShowWindow(hToolsPage, SW_SHOW);
-		ShowWindow(hStartupPage, SW_HIDE);
-		//ShowWindow(hFreeLdrPage, SW_HIDE);
-		ShowWindow(hServicesPage, SW_HIDE);
         BringWindowToTop(hToolsPage);
 		break;
 	}
@@ -145,6 +163,8 @@
 		DestroyWindow(hToolsPage);
 		DestroyWindow(hServicesPage);
 		DestroyWindow(hStartupPage);
+        DestroyWindow(hFreeLdrPage);
+        DestroyWindow(hSystemPage);
         return DefWindowProc(hDlg, message, wParam, lParam);
 
     }
  _____  

Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml
--- trunk/reactos/subsys/system/msconfig/msconfig.xml	2005-11-13
19:05:01 UTC (rev 19211)
+++ trunk/reactos/subsys/system/msconfig/msconfig.xml	2005-11-13
20:58:29 UTC (rev 19212)
@@ -13,7 +13,10 @@

 	<library>shell32</library>
 	<file>toolspage.c</file>
 	<file>srvpage.c</file>
+	<file>systempage.c</file>
 	<file>startuppage.c</file>
+	<file>freeldrpage.c</file>
+	<file>generalpage.c</file>
 	<file>msconfig.c</file>
 	<file>msconfig.rc</file>
 </module>
  _____  

Modified: trunk/reactos/subsys/system/msconfig/precomp.h
--- trunk/reactos/subsys/system/msconfig/precomp.h	2005-11-13
19:05:01 UTC (rev 19211)
+++ trunk/reactos/subsys/system/msconfig/precomp.h	2005-11-13
20:58:29 UTC (rev 19212)
@@ -9,6 +9,9 @@

 #include "toolspage.h"
 #include "srvpage.h"
 #include "startuppage.h"
+#include "freeldrpage.h"
+#include "systempage.h"
+#include "generalpage.h"
 
 #define MAX_KEY_LENGTH 255
 #define MAX_VALUE_NAME 16383
  _____  

Modified: trunk/reactos/subsys/system/msconfig/resource.h
--- trunk/reactos/subsys/system/msconfig/resource.h	2005-11-13
19:05:01 UTC (rev 19211)
+++ trunk/reactos/subsys/system/msconfig/resource.h	2005-11-13
20:58:29 UTC (rev 19212)
@@ -3,6 +3,8 @@

 #define IDD_SERVICES_PAGE                103
 #define IDD_GENERAL_PAGE                 104
 #define IDD_STARTUP_PAGE                 105
+#define IDD_FREELDR_PAGE                 106
+#define IDD_SYSTEM_PAGE                  107
 
 #define IDC_TAB                         1001
 #define IDC_BTN_APPLY                   1002
@@ -12,6 +14,10 @@
 #define IDC_SERVICES_LIST               1006
 #define IDC_TOOLS_LIST                  1007
 #define IDC_STARTUP_LIST                1008
+#define IDC_BTN_SERVICES_ACTIVATE       1009
+#define IDC_BTN_SERVICES_DEACTIVATE     1010
+#define IDC_BTN_STARTUP_ACTIVATE        1011
+#define IDC_BTN_STARTUP_DEACTIVATE      1012
 
 #define IDS_TAB_TOOLS                   2001
 #define IDS_TAB_SYSTEM                  2002
@@ -52,6 +58,9 @@
 
 #define IDS_SERVICES_STATUS_STOPPED     2200
 #define IDS_SERVICES_STATUS_RUNNING     2201
-#define IDS_YES                         2202
-#define IDS_NO                          2203
+#define IDS_SERVICES_YES                2202
+#define IDS_SERVICES_UNKNOWN            2203
+
+#define IDS_MSCONFIG                    3000
+
 /* EOF */
  _____  

Modified: trunk/reactos/subsys/system/msconfig/srvpage.c
--- trunk/reactos/subsys/system/msconfig/srvpage.c	2005-11-13
19:05:01 UTC (rev 19211)
+++ trunk/reactos/subsys/system/msconfig/srvpage.c	2005-11-13
20:58:29 UTC (rev 19212)
@@ -149,7 +149,7 @@

                     {
                         if (pServiceFailureActions->lpsaActions[0].Type
== SC_ACTION_REBOOT)
                         {
-                            LoadString(hInst, IDS_YES, szStatus, 128);
+                            LoadString(hInst, IDS_SERVICES_YES,
szStatus, 128);
                             item.pszText = szStatus;
                             item.iSubItem = 1;
                             SendMessage(hServicesListCtrl,
LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
@@ -211,8 +211,15 @@
                             item.pszText = lpBuffer;
                             item.iSubItem = 2;
                             SendMessage(hServicesListCtrl,
LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
-                        }
+                        }  
                     }
+                    else
+                    {
+                        LoadString(hInst, IDS_SERVICES_UNKNOWN,
szStatus, 128);
+                        item.pszText = szStatus;
+                        item.iSubItem = 2;
+                        SendMessage(hServicesListCtrl, LVM_SETITEMTEXT,
item.iItem, (LPARAM) &item);
+                    }
                     CloseServiceHandle(hService);
                 }
 
  _____  

Added: trunk/reactos/subsys/system/msconfig/systempage.c
--- trunk/reactos/subsys/system/msconfig/systempage.c	2005-11-13
19:05:01 UTC (rev 19211)
+++ trunk/reactos/subsys/system/msconfig/systempage.c	2005-11-13
20:58:29 UTC (rev 19212)
@@ -0,0 +1,17 @@

+#include <precomp.h>
+
+HWND hSystemPage;
+HWND hSystemDialog;
+
+INT_PTR CALLBACK
+SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
lParam)
+{
+    switch (message) {
+    case WM_INITDIALOG:
+        hSystemDialog = hDlg;
+	    SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE |
SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
+		return TRUE;
+	}
+
+  return 0;
+}
Property changes on: trunk/reactos/subsys/system/msconfig/systempage.c
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Added: trunk/reactos/subsys/system/msconfig/systempage.h
--- trunk/reactos/subsys/system/msconfig/systempage.h	2005-11-13
19:05:01 UTC (rev 19211)
+++ trunk/reactos/subsys/system/msconfig/systempage.h	2005-11-13
20:58:29 UTC (rev 19212)
@@ -0,0 +1,3 @@

+extern HWND hSystemPage;
+
+INT_PTR CALLBACK SystemPageWndProc(HWND hDlg, UINT message, WPARAM
wParam, LPARAM lParam);
Property changes on: trunk/reactos/subsys/system/msconfig/systempage.h
___________________________________________________________________
Name: svn:eol-style
   + native