- Apply patch by <j_anderw@sbox.tugraz.at>.

- User w32api.
- Fix some tchar issues.

svn path=/trunk/; revision=9942

diff --git a/reactos/lib/cpl/sysdm/Makefile b/reactos/lib/cpl/sysdm/Makefile
index 20f88d4..6a480a0 100644 (file)
--- a/reactos/lib/cpl/sysdm/Makefile
+++ b/reactos/lib/cpl/sysdm/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2004/05/29 21:24:43 hbirr Exp $
+# $Id: Makefile,v 1.3 2004/06/30 10:53:05 ekohl Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -13,10 +13,13 @@ TARGET_INSTALLDIR = system32
 TARGET_BASE = $(TARGET_BASE_LIB_CPL_SYSDM)
 
 TARGET_CFLAGS = \
+ -D_WIN32_IE=0x0600 \
+ -D_WIN32_WINNT=0x0501 \
  -I./include \
  -DUNICODE \
  -D_UNICODE \
  -D__REACTOS__ \
+ -D__USE_W32API \
  -Wall \
  -Werror \
  -fno-builtin
@@ -31,7 +34,7 @@ TARGET_PCH =
 
 TARGET_CLEAN = 
 
-TARGET_OBJECTS = sysdm.o general.o computer.o hardware.o advanced.o
+TARGET_OBJECTS = sysdm.o general.o computer.o hardware.o advanced.o userprofile.o
 
 DEP_OBJECTS = $(TARGET_OBJECTS)
 

diff --git a/reactos/lib/cpl/sysdm/advanced.c b/reactos/lib/cpl/sysdm/advanced.c
index 8cd77a8..c21c1b3 100644 (file)
--- a/reactos/lib/cpl/sysdm/advanced.c
+++ b/reactos/lib/cpl/sysdm/advanced.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: advanced.c,v 1.1 2004/03/08 14:24:47 weiden Exp $
+/* $Id: advanced.c,v 1.2 2004/06/30 10:53:05 ekohl Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/advanced.c
@@ -27,6 +27,8 @@
  */
 #include <windows.h>
 #include <stdlib.h>
+#include <tchar.h>
+
 #include "resource.h"
 #include "sysdm.h"
 
@@ -39,10 +41,14 @@ AdvancedPageProc(
   LPARAM lParam
 )
 {
-  switch(uMsg)
+  switch (uMsg)
   {
     case WM_INITDIALOG:
       break;
+
+    case WM_COMMAND:
+      break;
+
   }
   return FALSE;
 }

diff --git a/reactos/lib/cpl/sysdm/general.c b/reactos/lib/cpl/sysdm/general.c
index 50889de..9d8b137 100644 (file)
--- a/reactos/lib/cpl/sysdm/general.c
+++ b/reactos/lib/cpl/sysdm/general.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: general.c,v 1.1 2004/03/08 14:24:47 weiden Exp $
+/* $Id: general.c,v 1.2 2004/06/30 10:53:05 ekohl Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/general.c
@@ -26,21 +26,23 @@
  *      03-04-2004  Created
  */
 #include <windows.h>
+#include <tchar.h>
 #include <stdlib.h>
+
 #include "resource.h"
 #include "sysdm.h"
 
 void
 ShowLastWin32Error(HWND hWndOwner)
 {
-  LPWSTR lpMsg;
+  LPTSTR lpMsg;
   DWORD LastError;
   
   LastError = GetLastError();
   
   if((LastError == 0) || !FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | 
                     FORMAT_MESSAGE_FROM_SYSTEM, NULL, LastError, 
-                    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),(LPWSTR)&lpMsg, 0, 
+                    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),(LPTSTR)&lpMsg, 0, 
                     NULL))
   {
     return;

diff --git a/reactos/lib/cpl/sysdm/hardware.c b/reactos/lib/cpl/sysdm/hardware.c
index ef329b3..eb56423 100644 (file)
--- a/reactos/lib/cpl/sysdm/hardware.c
+++ b/reactos/lib/cpl/sysdm/hardware.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: hardware.c,v 1.1 2004/03/08 14:24:47 weiden Exp $
+/* $Id: hardware.c,v 1.2 2004/06/30 10:53:05 ekohl Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/hardware.c
@@ -27,17 +27,19 @@
  */
 #include <windows.h>
 #include <stdlib.h>
+#include <tchar.h>
+
 #include "resource.h"
 #include "sysdm.h"
 
-typedef WINBOOL (STDCALL *PDEVMGREXEC)(HWND hWndParent, HINSTANCE hInst, PVOID Unknown, int nCmdShow);
+typedef BOOL (STDCALL *PDEVMGREXEC)(HWND hWndParent, HINSTANCE hInst, PVOID Unknown, int nCmdShow);
 BOOL LaunchDeviceManager(HWND hWndParent)
 {
   HMODULE hDll;
   PDEVMGREXEC DevMgrExec;
   BOOL Ret;
-  
-  if(!(hDll = LoadLibrary(L"devmgr.dll")))
+
+  if(!(hDll = LoadLibrary(_TEXT("devmgr.dll"))))
   {
     return FALSE;
   }
@@ -68,7 +70,7 @@ HardwarePageProc(
     case WM_COMMAND:
       switch(LOWORD(wParam))
       {
-        case IDC_DEVMGR:
+        case IDC_HARDWARE_DEVICE_MANAGER:
           if(!LaunchDeviceManager(hwndDlg))
           {
             /* FIXME */

diff --git a/reactos/lib/cpl/sysdm/resource.h b/reactos/lib/cpl/sysdm/resource.h
index c6650a9..a6f4ff1 100644 (file)
--- a/reactos/lib/cpl/sysdm/resource.h
+++ b/reactos/lib/cpl/sysdm/resource.h
@@ -19,7 +19,8 @@
 #define IDD_PROPPAGEGENERAL    100
 #define IDD_PROPPAGECOMPUTER   101
 #define IDD_PROPPAGEHARDWARE   102
-#define IDD_PROPPAGEADVANCED   103
+#define IDD_PROPPAGEUSERPROFILE        103
+#define IDD_PROPPAGEADVANCED   104
 
 #define IDS_CPLSYSTEMNAME      1001
 #define IDS_CPLSYSTEMDESCRIPTION       2001
@@ -31,8 +32,23 @@
 #define IDC_PROCESSORSPEED      104
 #define IDC_SYSTEMMEMORY        105
 #define IDC_DEVMGR      106
+#define IDC_ENVVAR     107
+#define IDC_STAREC     108
 #define IDC_ICON1       201
 
+#define IDC_COMPUTERNAME       202
+#define IDC_WORKGROUPDOMAIN_NAME       203
+#define IDC_WORKGROUPDOMAIN    204
+#define IDC_NETWORK_ID 205
+#define IDC_NETWORK_PROPERTY   206
+#define IDC_HARDWARE_WIZARD    207
+#define IDC_HARDWARE_PROFILE   210
+#define IDC_HARDWARE_DRIVER_SIGN       211
+#define IDC_HARDWARE_DEVICE_MANAGER    212
+#define IDC_USERPROFILE_DELETE 213
+#define IDC_USERPROFILE_CHANGE 214
+#define IDC_USERPROFILE_COPY           215
+
 #endif /* __CPL_RESOURCE_H */
 
 /* EOF */

diff --git a/reactos/lib/cpl/sysdm/sysdm.c b/reactos/lib/cpl/sysdm/sysdm.c
index 08ab750..a786ae6 100644 (file)
--- a/reactos/lib/cpl/sysdm/sysdm.c
+++ b/reactos/lib/cpl/sysdm/sysdm.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: sysdm.c,v 1.1 2004/03/08 14:24:47 weiden Exp $
+/* $Id: sysdm.c,v 1.2 2004/06/30 10:53:05 ekohl Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/sysdm.c
@@ -26,17 +26,17 @@
  *      03-04-2004  Created
  */
 #include <windows.h>
+#include <commctrl.h>
+#include <prsht.h>
+#include <cpl.h>
 #include <stdlib.h>
+
 #include "resource.h"
 #include "sysdm.h"
 
 #define NUM_APPLETS    (1)
 
 LONG CALLBACK SystemApplet(VOID);
-BOOL CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK ComputerPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 HINSTANCE hApplet = 0;
 
 /* Applets */
@@ -52,7 +52,7 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
   psp->dwSize = sizeof(PROPSHEETPAGE);
   psp->dwFlags = PSP_DEFAULT;
   psp->hInstance = hApplet;
-  psp->u1.pszTemplate = MAKEINTRESOURCE(idDlg);
+  psp->pszTemplate = MAKEINTRESOURCE(idDlg);
   psp->pfnDlgProc = DlgProc;
 }
 
@@ -93,7 +93,7 @@ PropSheetProc(
 LONG CALLBACK
 SystemApplet(VOID)
 {
-  PROPSHEETPAGE psp[4];
+  PROPSHEETPAGE psp[5];
   PROPSHEETHEADER psh;
   TCHAR Caption[1024];
   
@@ -101,20 +101,21 @@ SystemApplet(VOID)
   
   ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
   psh.dwSize = sizeof(PROPSHEETHEADER);
-  psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE;
+  psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_PROPTITLE; /* | PSH_USECALLBACK */
   psh.hwndParent = NULL;
   psh.hInstance = hApplet;
-  psh.u1.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
+  psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
   psh.pszCaption = Caption;
   psh.nPages = sizeof(psp) / sizeof(PROPSHEETHEADER);
-  psh.u2.nStartPage = 0;
-  psh.u3.ppsp = psp;
-  psh.pfnCallback = PropSheetProc;
+  psh.nStartPage = 0;
+  psh.ppsp = psp;
+  psh.pfnCallback = NULL; /* PropSheetProc; */
   
   InitPropSheetPage(&psp[0], IDD_PROPPAGEGENERAL, GeneralPageProc);
   InitPropSheetPage(&psp[1], IDD_PROPPAGECOMPUTER, ComputerPageProc);
   InitPropSheetPage(&psp[2], IDD_PROPPAGEHARDWARE, HardwarePageProc);
-  InitPropSheetPage(&psp[3], IDD_PROPPAGEADVANCED, AdvancedPageProc);
+  InitPropSheetPage(&psp[3], IDD_PROPPAGEUSERPROFILE, UserProfilePageProc);
+  InitPropSheetPage(&psp[4], IDD_PROPPAGEADVANCED, AdvancedPageProc);
   
   return (LONG)(PropertySheet(&psh) != -1);
 }

diff --git a/reactos/lib/cpl/sysdm/sysdm.h b/reactos/lib/cpl/sysdm/sysdm.h
index 0640f5f..0fc2615 100644 (file)
--- a/reactos/lib/cpl/sysdm/sysdm.h
+++ b/reactos/lib/cpl/sysdm/sysdm.h
@@ -1,20 +1,30 @@
 #ifndef __CPL_SYSDM_H
 #define __CPL_SYSDM_H
 
-typedef LONG (CALLBACK *APPLET_PROC)(VOID);
+typedef LONG (CALLBACK *APPLET_INITPROC)(VOID);
 
 typedef struct
 {
   int idIcon;
   int idName;
   int idDescription;
-  APPLET_PROC AppletProc;
+  APPLET_INITPROC AppletProc;
 } APPLET, *PAPPLET;
 
 extern HINSTANCE hApplet;
 
 void ShowLastWin32Error(HWND hWndOwner);
 
+BOOL CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK ComputerPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK UserProfilePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+
+//BOOL CALLBACK EnvironmentDlgProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+
 #endif /* __CPL_SYSDM_H */
 
 /* EOF */

diff --git a/reactos/lib/cpl/sysdm/sysdm.rc b/reactos/lib/cpl/sysdm/sysdm.rc
index 64a2fba..a47bcd2 100644 (file)
--- a/reactos/lib/cpl/sysdm/sysdm.rc
+++ b/reactos/lib/cpl/sysdm/sysdm.rc
@@ -1,5 +1,6 @@
 #include <reactos/resource.h>
 #include <defines.h>
+#include <commctrl.h>
 #include "resource.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
@@ -61,21 +62,54 @@ END
 
 IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Computer Name"
+CAPTION "Network Identification"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  /* LTEXT "Property Page 2",-1,73,74,90,8 */
+  ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON
+  LTEXT "Windows uses the following information to identify your computer on the network.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  LTEXT "Full computer name:",-1,PROPSHEETPADDING,LABELLINE(4)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4)-4
+  LTEXT "",IDC_COMPUTERNAME,90,LABELLINE(4)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4)-5
+  LTEXT "Workgroup:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)-6
+  LTEXT "",IDC_WORKGROUPDOMAIN_NAME,90,LABELLINE(6)-6,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)-6
+  LTEXT "To use the Network Identfication Wizard to join a domain and create a local user, click Network ID.",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(8)+5
+  PUSHBUTTON "&Network ID",IDC_NETWORK_ID,185,LABELLINE(7)+5,54,LABELLINE(1)+4
+  LTEXT "To rename this computer or join a domain, click Properties.",-1,PROPSHEETPADDING,LABELLINE(11)+2,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(12)+2
+  PUSHBUTTON "&Properties",IDC_NETWORK_PROPERTY,185,LABELLINE(11)+2,54,LABELLINE(1)+4
 END
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardware"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  GROUPBOX "Hardware Devices",-1,PROPSHEETPADDING,PROPSHEETPADDING,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+BEGIN  
+  GROUPBOX "Hardware Wizard",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "The Hardware wizard helps you install, uninstall, repair, unplug, eject, and configure your hardware.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
   ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON
-  LTEXT "The Device Manager lists all the hardware devices that are installed on your computer. Use the Device Manger to change their settings.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
-  PUSHBUTTON "&Device Manager",IDC_DEVMGR,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Hardware Wizard",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+
+  GROUPBOX "Device Manager",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON
+  LTEXT "The Device Manager lists all the hardware devices installed on your computer. Use the Device Manager to change the properties of any device.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  
+  PUSHBUTTON "&Device Manager",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+
+  GROUPBOX "Hardware Profiles",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON
+  LTEXT "Hardware profiles provide a way for you to set up and store different hardware configurations.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  PUSHBUTTON "&Hardware Profiles",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14
+END
+
+IDD_PROPPAGEUSERPROFILE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "User Profiles"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON
+  LTEXT "User profiles contain desktop settings and other information related to your login. A different profile can be created on each computer you use, or you can select a roaming profile that is the same on every computer you use.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4)
+  LTEXT "Profiles stored on this computer:",-1,PROPSHEETPADDING,LABELLINE(6),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)
+  PUSHBUTTON "Delete",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(23),60,LABELLINE(1)+2
+  PUSHBUTTON "Change Type",IDC_USERPROFILE_CHANGE,95,LABELLINE(23),60,LABELLINE(1)+2
+  PUSHBUTTON "Copy To",IDC_USERPROFILE_COPY,180,LABELLINE(23),60,LABELLINE(1)+2
 END
 
 IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
@@ -83,7 +117,18 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  /* LTEXT "Property Page 4",-1,73,74,90,8 */
+  GROUPBOX "Performance",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON
+  LTEXT "Performance options control how applications use memory, which affects the speed of your computer.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  PUSHBUTTON "&Performance Options",IDC_ENVVAR,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "Environment Variables",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON
+  LTEXT "Environment variables tell your computer where to find certain types of information.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(11)
+  PUSHBUTTON "&Environment Variables",IDC_ENVVAR,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(12)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "Startup and Recovery",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON
+  LTEXT "Startup and recovery options tell your computer how to start and what to do if an error causes your computer to stop.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  PUSHBUTTON "&Startup and Recovery",IDC_STAREC,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(19)+2,(15*PROPSHEETPADDING),14
 END
 
 STRINGTABLE 

diff --git a/reactos/lib/cpl/sysdm/userprofile.c b/reactos/lib/cpl/sysdm/userprofile.c
new file mode 100644 (file)
index 0000000..fd2425f
--- /dev/null
+++ b/reactos/lib/cpl/sysdm/userprofile.c
@@ -0,0 +1,48 @@
+/*
+ *  ReactOS
+ *  Copyright (C) 2004 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: userprofile.c,v 1.1 2004/06/30 10:53:05 ekohl Exp $
+ *
+ * PROJECT:         ReactOS System Control Panel
+ * FILE:            lib/cpl/system/computer.c
+ * PURPOSE:         Computer settings for networking
+ * PROGRAMMER:      Thomas Weidenmueller (w3seek@users.sourceforge.net)
+ * UPDATE HISTORY:
+ *      03-04-2004  Created
+ */
+#include <windows.h>
+#include <stdlib.h>
+#include "resource.h"
+#include "sysdm.h"
+
+/* Property page dialog callback */
+BOOL CALLBACK
+UserProfilePageProc(
+  HWND hwndDlg,
+  UINT uMsg,
+  WPARAM wParam,
+  LPARAM lParam
+)
+{
+  switch(uMsg)
+  {
+    case WM_INITDIALOG:
+      break; //GetUserName
+  }
+  return FALSE;
+}