[ros-diffs] [gschneider] 51814: [syssetup] Remove duplicate code, adjust message box text to fit the context

Author: gschneider
Date: Tue May 17 19:33:22 2011
New Revision: 51814

URL: http://svn.reactos.org/svn/reactos?rev=51814&view=rev
Log:
[syssetup] Remove duplicate code, adjust message box text to fit the context

Modified:
    trunk/reactos/dll/win32/syssetup/wizard.c

Modified: trunk/reactos/dll/win32/syssetup/wizard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Tue May 17 19:33:22 2011
@@ -1453,7 +1453,7 @@
       if (0 == LoadStringW(hDllInstance, IDS_WZD_LOCALTIME, ErrorLocalTime,
                            sizeof(ErrorLocalTime) / sizeof(ErrorLocalTime[0])))
       {
-        wcscpy(ErrorLocalTime, L"Setup failed to set the computer name.");
+        wcscpy(ErrorLocalTime, L"Setup was unable to set the local time.");
       }
       MessageBoxW(hwndDlg, ErrorLocalTime, Title, MB_ICONWARNING | MB_OK);
       return FALSE;
@@ -1469,8 +1469,6 @@
                     LPARAM lParam)
 {
   PSETUPDATA SetupData;
-  WCHAR Title[64];
-  WCHAR ErrorLocalTime[256];
 
   /* Retrieve pointer to the global setup data */
   SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
@@ -1525,23 +1523,7 @@
 
               case PSN_WIZNEXT:
                 {
-                  GetLocalSystemTime(hwndDlg, SetupData);
-                  SetLocalTimeZone(GetDlgItem(hwndDlg, IDC_TIMEZONELIST),
-                                   SetupData);
-                  SetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT));
-                  if(!SetSystemLocalTime(hwndDlg, SetupData))
-                  {
-                    if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title,
sizeof(Title) / sizeof(Title[0])))
-                    {
-                      wcscpy(Title, L"ReactOS Setup");
-                    }
-                    if (0 == LoadStringW(hDllInstance, IDS_WZD_LOCALTIME,
ErrorLocalTime,
-                                         sizeof(ErrorLocalTime) /
sizeof(ErrorLocalTime[0])))
-                    {
-                      wcscpy(ErrorLocalTime, L"Setup failed to set the computer
name.");
-                    }
-                    MessageBoxW(hwndDlg, ErrorLocalTime, Title, MB_ICONWARNING | MB_OK);
-                  }
+                    WriteDateTimeSettings(hwndDlg, SetupData);
                 }
                 break;