Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[dgorbachev] 40688: Update Norwegian translations (translator: Lars Martin Hambro, bug #2482, bug #4325). This patch was already applied in r40315, but mistakenly reverted in r40564. Sorry.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sat Apr 25 02:19:41 2009 New Revision: 40688 URL: http://svn.reactos.org/svn/reactos?rev=40688&view=rev Log: Update Norwegian translations (translator: Lars Martin Hambro, bug #2482, bug #4325). This patch was already applied in r40315, but mistakenly reverted in r40564. Sorry. Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/userenv/lang/no-NO.rc Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Sat Apr 25 02:19:41 2009 @@ -55,7 +55,7 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Fargevalg", IDC_STATIC, 7, 140, 64, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "&Effekter...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Avansert", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END @@ -100,24 +100,24 @@ IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Effects" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", +CAPTION "Effekter" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Bruk følgende overgang effekter for menyer og verktøytips:",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "B&ruk følgende metode for kantutjevning av skjerm skifter:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + CONTROL "Br&uk store ikoner",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "Vis sk&ygger under menyer",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "Vis &vindu innholdet ved flytting",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 - CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + CONTROL "&Skjul visning av understrekning for tastatur hurtigtast til jeg trykker på Alt tasten",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 - PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END @@ -134,7 +134,7 @@ CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Mindre",1815,9,137,21,8,NOT WS_GROUP - LTEXT "Mere",1816,93,137,21,8,NOT WS_GROUP + LTEXT "Større",1816,93,137,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,157,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "&Farger",1817,125,127,115,43 COMBOBOX IDC_SETTINGS_BPP,131,137,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | @@ -171,7 +171,7 @@ POPUP "" BEGIN MENUITEM "&Attached", ID_MENU_ATTACHED - MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM "&Primær", ID_MENU_PRIMARY MENUITEM SEPARATOR MENUITEM "&Identify", ID_MENU_IDENTIFY MENUITEM "E&genskaper", ID_MENU_PROPERTIES @@ -180,14 +180,14 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Slide effect" - IDS_FADEEFFECT "Fade effect" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_SLIDEEFFECT "Slide effekter" + IDS_FADEEFFECT "Fade effekter" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Vanlig" + IDS_CLEARTYPEEFFECT "Klartype" END STRINGTABLE @@ -228,8 +228,8 @@ IDS_INACTWIN "Uaktiv vindu" IDS_ACTWIN "Aktiv vindu" IDS_WINTEXT "Vindu tekst" - IDS_MESSBOX "Melding boks" - IDS_MESSTEXT "Melding tekst" + IDS_MESSBOX "Meldingboks" + IDS_MESSTEXT "Meldingtekst" IDS_BUTTEXT "OK" END @@ -244,18 +244,18 @@ IDS_ELEMENT_7 "Valgt enhet" IDS_ELEMENT_8 "Vindu" IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_10 "3D objekter" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Tegn tittel" IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_14 "Deaktivert meny elementer" IDS_ELEMENT_15 "Dialog" IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_17 "Program bakgrunn" IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Symbol distance (horizontal)" - IDS_ELEMENT_20 "Symbol distance (vertical)" - IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_19 "Tegn avstand (horisontalt)" + IDS_ELEMENT_20 "Tegn avstand (vertikalt)" + IDS_ELEMENT_21 "Rask infomasjon" IDS_ELEMENT_22 "Symbol" END Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Sat Apr 25 02:19:41 2009 @@ -201,8 +201,8 @@ BEGIN IDS_ACCESSORIES "Tilbehør" IDS_CMT_CALC "Start Kalkulator" - IDS_CMT_CMD "Åpne command prompt" - IDS_CMT_EXPLORER "Start Explorer" + IDS_CMT_CMD "Åpne Kommandolinje" + IDS_CMT_EXPLORER "Start Utforsker" IDS_CMT_NOTEPAD "Start Tekstredigering" IDS_CMT_REGEDIT "Start Registerredigering" IDS_CMT_WORDPAD "Start Dokument redigering" @@ -210,48 +210,48 @@ IDS_CMT_DEVMGMT "Start Enhetsbehandler" IDS_CMT_SERVMAN "Start Tjenestebehandler" IDS_CMT_RDESKTOP "Start Ekstern skrivebord" - IDS_CMT_EVENTVIEW "Launch Event Viewer" - IDS_CMT_MSCONFIG "Launch System Configuration program" -END - -STRINGTABLE -BEGIN - IDS_GAMES "Spill" - IDS_CMT_SOLITAIRE "Kabal" - IDS_CMT_WINEMINE "Minnesveiper" -END - -STRINGTABLE -BEGIN - IDS_SYS_TOOLS "System verktøy" - IDS_CMT_CHARMAP "Tegnkart" - IDS_CMT_KBSWITCH "Endre tastatur valg" - IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" -END - -STRINGTABLE -BEGIN - IDS_SYS_ACCESSIBILITY "Tilgjengelighet" - IDS_CMT_MAGNIFY "Forstørrelse" -END - -STRINGTABLE -BEGIN - IDS_SYS_ENTERTAINMENT "Entertainment" - IDS_CMT_MPLAY32 "Launch Multimedia Player" - IDS_CMT_SNDVOL32 "Launch Volume Control" -END - -STRINGTABLE -BEGIN - IDS_REACTOS_SETUP "ReactOS installasjon" + IDS_CMT_EVENTVIEW "Start Hendelseliste" + IDS_CMT_MSCONFIG "Start Systemkonfigurasjon" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Spill" + IDS_CMT_SOLITAIRE "Kabal" + IDS_CMT_WINEMINE "Minnesveiper" +END + +STRINGTABLE +BEGIN + IDS_SYS_TOOLS "Systemverktøy" + IDS_CMT_CHARMAP "Tegnkart" + IDS_CMT_KBSWITCH "Endre tastaturvalg" + IDS_CMT_DXDIAG "Kjør ReactX-Diagnose program" +END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Tilgjengelighet" + IDS_CMT_MAGNIFY "Forstørrelse" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Underholdning" + IDS_CMT_MPLAY32 "Start Multimedia avspiller" + IDS_CMT_SNDVOL32 "Start Volumkontroll" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "ReactOS installasjon" IDS_UNKNOWN_ERROR "Ukjent feil" IDS_REGISTERING_COMPONENTS "Registrerer komponenter..." - IDS_LOADLIBRARY_FAILED "LoadLibrary feilet: " - IDS_GETPROCADDR_FAILED "GetProcAddr feilet: " + IDS_LOADLIBRARY_FAILED "LoadLibrary feilet: " + IDS_GETPROCADDR_FAILED "GetProcAddr feilet: " IDS_REGSVR_FAILED "DllRegisterServer feilet: " - IDS_DLLINSTALL_FAILED "DllInstall feilet: " - IDS_TIMEOUT "Tidsavbrudd under registrering" + IDS_DLLINSTALL_FAILED "DllInstall feilet: " + IDS_TIMEOUT "Tidsavbrudd under registrering" IDS_REASON_UNKNOWN "" END @@ -282,13 +282,13 @@ STRINGTABLE BEGIN - IDS_WZD_NAME "Installasjonen kan ikke fortsette uten ditt navn." - IDS_WZD_SETCOMPUTERNAME "Installasjonen klarte ikke sette datamaskinnavnet." - IDS_WZD_COMPUTERNAME "Installasjonen kan ikke fortsette før du taster inn navn for datamaskinen." - IDS_WZD_PASSWORDEMPTY "Du må taste et passord!" - IDS_WZD_PASSWORDMATCH "Passordene du tastet er ikke like. Vennligst tast inn på nytt." - IDS_WZD_PASSWORDCHAR "Passordet du tastet inneholder ugyldige tegn. Vennligst tast inn et annet." - IDS_WZD_LOCALTIME "Installasjonen klarte ikke å sette lokal tid." + IDS_WZD_NAME "Installasjonen kan ikke fortsette uten ditt navn." + IDS_WZD_SETCOMPUTERNAME "Installasjonen klarte ikke sette datamaskinnavnet." + IDS_WZD_COMPUTERNAME "Installasjonen kan ikke fortsette før du taster inn navn for datamaskinen." + IDS_WZD_PASSWORDEMPTY "Du må taste et passord!" + IDS_WZD_PASSWORDMATCH "Passordene du tastet er ikke like. Vennligst tast inn på nytt." + IDS_WZD_PASSWORDCHAR "Passordet du tastet inneholder ugyldige tegn. Vennligst tast inn et annet." + IDS_WZD_LOCALTIME "Installasjonen klarte ikke å sette lokal tid." END STRINGTABLE Modified: trunk/reactos/dll/win32/userenv/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/no-NO.rc [iso-8859-1] Sat Apr 25 02:19:41 2009 @@ -23,7 +23,7 @@ STRINGTABLE BEGIN - IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" + IDS_PROFILEPATH "%SystemDrive%\\Dokumenter og innstillinger" IDS_APPDATA "Programdata" IDS_DESKTOP "Skrivebord" IDS_FAVORITES "Favoritter" @@ -31,21 +31,21 @@ IDS_PROGRAMS "Start-Meny\\Programmer" IDS_ADMINTOOLS "Start-Meny\\Programmer\\Administrative verktøy" IDS_STARTUP "Start-Meny\\Programmer\\Oppstart" - IDS_MYDOCUMENTS "Mine Dokumenter" - IDS_MYPICTURES "Mine Dokumenter\\Mine Bilder" - IDS_MYMUSIC "Mine Dokumenter\\Min Musikk" - IDS_MYVIDEOS "Mine Dokumenter\\Mine Filmer" + IDS_MYDOCUMENTS "Mine dokumenter" + IDS_MYPICTURES "Mine dokumenter\\Mine bilder" + IDS_MYMUSIC "Mine dokumenter\\Min musikk" + IDS_MYVIDEOS "Mine dokumenter\\Mine filmer" IDS_TEMPLATES "Templates" IDS_RECENT "Siste" - IDS_SENDTO "SendTo" + IDS_SENDTO "Send til" IDS_PRINTHOOD "PrintHood" IDS_NETHOOD "NetHood" IDS_LOCALSETTINGS "Lokale innstillinger" IDS_LOCALAPPDATA "Lokale innstillinger\\Programdata" - IDS_TEMP "Lokale innstillinger\\Temp" - IDS_CACHE "Lokale innstillinger\\Temporary Internet Files" + IDS_TEMP "Lokale innstillinger\\Midlertidig" + IDS_CACHE "Lokale innstillinger\\Midlertidig internett filer" IDS_HISTORY "Lokale innstillinger\\Logg" - IDS_COOKIES "Cookies" + IDS_COOKIES "Informasjonkapsel" IDS_PROGRAMFILES "%SystemDrive%\\Programfiler" IDS_COMMONFILES "Common Files" END

15 years, 9 months

[hpoussin] 40687: WINLDR: Repair LiveCD boot

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Apr 25 01:48:20 2009 New Revision: 40687 URL: http://svn.reactos.org/svn/reactos?rev=40687&view=rev Log: WINLDR: Repair LiveCD boot Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sat Apr 25 01:48:20 2009 @@ -469,6 +469,14 @@ return; } + /* Special case for LiveCD */ + if (!_strnicmp(FullPath, "LiveCD", strlen("LiveCD"))) + { + strcpy(BootPath, FullPath + strlen("LiveCD")); + MachDiskGetBootPath(FullPath, sizeof(FullPath)); + strcat(FullPath, BootPath); + } + /* Convert FullPath to SystemRoot */ PathSeparator = strstr(FullPath, "\\"); strcpy(SystemRoot, PathSeparator); @@ -479,14 +487,6 @@ { /* Nothing read, make the string empty */ strcpy(BootOptions, ""); - } - - /* Special case for LiveCD */ - if (!_strnicmp(SystemRoot, "LiveCD", strlen("LiveCD"))) - { - strcpy(BootPath, SystemRoot + strlen("LiveCD")); - MachDiskGetBootPath(SystemRoot, sizeof(SystemRoot)); - strcat(SystemRoot, BootPath); } /* Let user know we started loading */

15 years, 9 months

[hpoussin] 40686: Implement ArcGetTime() and ArcGetRelativeTime()

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Apr 25 00:35:11 2009 New Revision: 40686 URL: http://svn.reactos.org/svn/reactos?rev=40686&view=rev Log: Implement ArcGetTime() and ArcGetRelativeTime() Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/mach.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/custom.c trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/boot/freeldr/freeldr/ui/tui.c trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c trunk/reactos/include/reactos/arc/arc.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/mach.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/mach.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -54,7 +54,7 @@ MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount; - MachVtbl.RTCGetCurrentDateTime = PcRTCGetCurrentDateTime; + MachVtbl.GetTime = PcGetTime; MachVtbl.HwDetect = PcHwDetect; } Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -1,104 +1,5 @@ -/* $Id: pcrtc.c 21339 2006-03-18 22:09:16Z peterw $ - * - * FreeLoader - * - * 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. - */ +/* No need to duplicate code ; import the i386 version */ -#include <freeldr.h> - -#define BCD_INT(bcd) (((bcd & 0xf0) >> 4) * 10 + (bcd &0x0f)) - -VOID -PcRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second) -{ - REGS Regs; - - if (NULL != Year || NULL != Month || NULL != Day) - { - /* Some BIOSes, such es the 1998/07/25 system ROM - * in the Compaq Deskpro EP/SB, leave CF unchanged - * if successful, so CF should be cleared before - * calling this function. */ - __asm__ ("clc"); - - /* Int 1Ah AH=04h - * TIME - GET REAL-TIME CLOCK DATE (AT,XT286,PS) - * - * AH = 04h - * CF clear to avoid bug - * Return: - * CF clear if successful - * CH = century (BCD) - * CL = year (BCD) - * DH = month (BCD) - * DL = day (BCD) - * CF set on error - */ - Regs.b.ah = 0x04; - Int386(0x1A, &Regs, &Regs); - - if (NULL != Year) - { - *Year = 100 * BCD_INT(Regs.b.ch) + BCD_INT(Regs.b.cl); - } - if (NULL != Month) - { - *Month = BCD_INT(Regs.b.dh); - } - if (NULL != Day) - { - *Day = BCD_INT(Regs.b.dl); - } - } - - if (NULL != Hour || NULL != Minute || NULL != Second) - { - /* Some BIOSes leave CF unchanged if successful, - * so CF should be cleared before calling this function. */ - __asm__ ("clc"); - - /* Int 1Ah AH=02h - * TIME - GET REAL-TIME CLOCK TIME (AT,XT286,PS) - * - * AH = 02h - * CF clear to avoid bug - * Return: - * CF clear if successful - * CH = hour (BCD) - * CL = minutes (BCD) - * DH = seconds (BCD) - * DL = daylight savings flag (00h standard time, 01h daylight time) - * CF set on error (i.e. clock not running or in middle of update) - */ - Regs.b.ah = 0x02; - Int386(0x1A, &Regs, &Regs); - - if (NULL != Hour) - { - *Hour = BCD_INT(Regs.b.ch); - } - if (NULL != Minute) - { - *Minute = BCD_INT(Regs.b.cl); - } - if (NULL != Second) - { - *Second = BCD_INT(Regs.b.dh); - } - } -} +#include "../i386/pcrtc.c" /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -54,7 +54,7 @@ MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount; - MachVtbl.RTCGetCurrentDateTime = PcRTCGetCurrentDateTime; + MachVtbl.GetTime = PcGetTime; MachVtbl.HwDetect = PcHwDetect; } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -57,7 +57,7 @@ MachVtbl.DiskGetPartitionEntry = XboxDiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = XboxDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = XboxDiskGetCacheableBlockCount; - MachVtbl.RTCGetCurrentDateTime = XboxRTCGetCurrentDateTime; + MachVtbl.GetTime = XboxGetTime; MachVtbl.HwDetect = XboxHwDetect; /* Set LEDs to orange after init */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -21,84 +21,63 @@ #define BCD_INT(bcd) (((bcd & 0xf0) >> 4) * 10 + (bcd &0x0f)) -VOID -PcRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second) +TIMEINFO* +PcGetTime(VOID) { - REGS Regs; + static TIMEINFO TimeInfo; + REGS Regs; - if (NULL != Year || NULL != Month || NULL != Day) - { - /* Some BIOSes, such es the 1998/07/25 system ROM - * in the Compaq Deskpro EP/SB, leave CF unchanged - * if successful, so CF should be cleared before - * calling this function. */ - __asm__ ("clc"); + /* Some BIOSes, such as the 1998/07/25 system ROM + * in the Compaq Deskpro EP/SB, leave CF unchanged + * if successful, so CF should be cleared before + * calling this function. */ + __asm__ ("clc"); - /* Int 1Ah AH=04h - * TIME - GET REAL-TIME CLOCK DATE (AT,XT286,PS) - * - * AH = 04h - * CF clear to avoid bug - * Return: - * CF clear if successful - * CH = century (BCD) - * CL = year (BCD) - * DH = month (BCD) - * DL = day (BCD) - * CF set on error - */ - Regs.b.ah = 0x04; - Int386(0x1A, &Regs, &Regs); + /* Int 1Ah AH=04h + * TIME - GET REAL-TIME CLOCK DATE (AT,XT286,PS) + * + * AH = 04h + * CF clear to avoid bug + * Return: + * CF clear if successful + * CH = century (BCD) + * CL = year (BCD) + * DH = month (BCD) + * DL = day (BCD) + * CF set on error + */ + Regs.b.ah = 0x04; + Int386(0x1A, &Regs, &Regs); - if (NULL != Year) - { - *Year = 100 * BCD_INT(Regs.b.ch) + BCD_INT(Regs.b.cl); - } - if (NULL != Month) - { - *Month = BCD_INT(Regs.b.dh); - } - if (NULL != Day) - { - *Day = BCD_INT(Regs.b.dl); - } - } + TimeInfo.Year = 100 * BCD_INT(Regs.b.ch) + BCD_INT(Regs.b.cl); + TimeInfo.Month = BCD_INT(Regs.b.dh); + TimeInfo.Day = BCD_INT(Regs.b.dl); - if (NULL != Hour || NULL != Minute || NULL != Second) - { - /* Some BIOSes leave CF unchanged if successful, - * so CF should be cleared before calling this function. */ - __asm__ ("clc"); + /* Some BIOSes leave CF unchanged if successful, + * so CF should be cleared before calling this function. */ + __asm__ ("clc"); - /* Int 1Ah AH=02h - * TIME - GET REAL-TIME CLOCK TIME (AT,XT286,PS) - * - * AH = 02h - * CF clear to avoid bug - * Return: - * CF clear if successful - * CH = hour (BCD) - * CL = minutes (BCD) - * DH = seconds (BCD) - * DL = daylight savings flag (00h standard time, 01h daylight time) - * CF set on error (i.e. clock not running or in middle of update) - */ - Regs.b.ah = 0x02; - Int386(0x1A, &Regs, &Regs); + /* Int 1Ah AH=02h + * TIME - GET REAL-TIME CLOCK TIME (AT,XT286,PS) + * + * AH = 02h + * CF clear to avoid bug + * Return: + * CF clear if successful + * CH = hour (BCD) + * CL = minutes (BCD) + * DH = seconds (BCD) + * DL = daylight savings flag (00h standard time, 01h daylight time) + * CF set on error (i.e. clock not running or in middle of update) + */ + Regs.b.ah = 0x02; + Int386(0x1A, &Regs, &Regs); - if (NULL != Hour) - { - *Hour = BCD_INT(Regs.b.ch); - } - if (NULL != Minute) - { - *Minute = BCD_INT(Regs.b.cl); - } - if (NULL != Second) - { - *Second = BCD_INT(Regs.b.dh); - } - } + TimeInfo.Hour = BCD_INT(Regs.b.ch); + TimeInfo.Minute = BCD_INT(Regs.b.cl); + TimeInfo.Second = BCD_INT(Regs.b.dh); + + return &TimeInfo; } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -37,46 +37,28 @@ return(Val); } -VOID -XboxRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second) +TIMEINFO* +XboxGetTime(VOID) { - while (HalpQueryCMOS (RTC_REGISTER_A) & RTC_REG_A_UIP) + static TIMEINFO TimeInfo; + + while (HalpQueryCMOS (RTC_REGISTER_A) & RTC_REG_A_UIP) { - ; + ; } - if (NULL != Second) - { - *Second = BCD_INT(HalpQueryCMOS(0)); - } - if (NULL != Minute) - { - *Minute = BCD_INT(HalpQueryCMOS(2)); - } - if (NULL != Hour) - { - *Hour = BCD_INT(HalpQueryCMOS(4)); - } - if (NULL != Day) - { - *Day = BCD_INT(HalpQueryCMOS(7)); - } - if (NULL != Month) - { - *Month = BCD_INT(HalpQueryCMOS(8)); - } - if (NULL != Year) - { - *Year = BCD_INT(HalpQueryCMOS(9)); - if (*Year > 80) - { - *Year += 1900; - } - else - { - *Year += 2000; - } - } + TimeInfo.Second = BCD_INT(HalpQueryCMOS(0)); + TimeInfo.Minute = BCD_INT(HalpQueryCMOS(2)); + TimeInfo.Hour = BCD_INT(HalpQueryCMOS(4)); + TimeInfo.Day = BCD_INT(HalpQueryCMOS(7)); + TimeInfo.Month = BCD_INT(HalpQueryCMOS(8)); + TimeInfo.Year = BCD_INT(HalpQueryCMOS(9)); + if (TimeInfo.Year > 80) + TimeInfo.Year += 1900; + else + TimeInfo.Year += 2000; + + return &TimeInfo; } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -342,9 +342,12 @@ return 1; } -VOID PpcRTCGetCurrentDateTime( PULONG Hear, PULONG Month, PULONG Day, - PULONG Hour, PULONG Minute, PULONG Second ) { - //printf("RTCGeturrentDateTime\n"); +TIMEINFO* +PpcGetTime(VOID) +{ + static TIMEINFO TimeInfo; + //printf("PpcGetTime\n"); + return &TimeInfo; } VOID NarrowToWide(WCHAR *wide_name, char *name) @@ -534,7 +537,7 @@ MachVtbl.DiskGetDriveGeometry = PpcDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = PpcDiskGetCacheableBlockCount; - MachVtbl.RTCGetCurrentDateTime = PpcRTCGetCurrentDateTime; + MachVtbl.GetTime = PpcGetTime; MachVtbl.HwDetect = PpcHwDetect; } Modified: trunk/reactos/boot/freeldr/freeldr/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/custo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/custom.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/custom.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -79,7 +79,7 @@ CHAR SectionName[100]; CHAR BootDriveString[20]; ULONG SectionId; - ULONG Year, Month, Day, Hour, Minute, Second; + TIMEINFO* TimeInfo; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); @@ -90,8 +90,8 @@ } // Generate a unique section name - MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomBootDisk%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); + TimeInfo = ArcGetTime(); + sprintf(SectionName, "CustomBootDisk%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) @@ -122,7 +122,7 @@ CHAR BootDriveString[20]; CHAR BootPartitionString[20]; ULONG SectionId; - ULONG Year, Month, Day, Hour, Minute, Second; + TIMEINFO* TimeInfo; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); @@ -139,8 +139,8 @@ } // Generate a unique section name - MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomBootPartition%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); + TimeInfo = ArcGetTime(); + sprintf(SectionName, "CustomBootPartition%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) @@ -178,7 +178,7 @@ CHAR BootPartitionString[20]; CHAR BootSectorFileString[200]; ULONG SectionId; - ULONG Year, Month, Day, Hour, Minute, Second; + TIMEINFO* TimeInfo; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); @@ -201,8 +201,8 @@ } // Generate a unique section name - MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomBootSectorFile%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); + TimeInfo = ArcGetTime(); + sprintf(SectionName, "CustomBootSectorFile%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) @@ -248,7 +248,7 @@ CHAR ReactOSARCPath[200]; CHAR ReactOSOptions[200]; ULONG SectionId; - ULONG Year, Month, Day, Hour, Minute, Second; + TIMEINFO* TimeInfo; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); @@ -277,8 +277,8 @@ } // Generate a unique section name - MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomReactOS%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); + TimeInfo = ArcGetTime(); + sprintf(SectionName, "CustomReactOS%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) @@ -321,7 +321,7 @@ CHAR LinuxInitrdString[200]; CHAR LinuxCommandLineString[200]; ULONG SectionId; - ULONG Year, Month, Day, Hour, Minute, Second; + TIMEINFO* TimeInfo; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); @@ -356,8 +356,8 @@ } // Generate a unique section name - MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomLinux%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); + TimeInfo = ArcGetTime(); + sprintf(SectionName, "CustomLinux%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -55,7 +55,7 @@ BOOLEAN PcDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); ULONG PcDiskGetCacheableBlockCount(ULONG DriveNumber); -VOID PcRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); +TIMEINFO* PcGetTime(VOID); PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -54,7 +54,7 @@ BOOLEAN PcDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); ULONG PcDiskGetCacheableBlockCount(ULONG DriveNumber); -VOID PcRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); +TIMEINFO* PcGetTime(VOID); PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -57,7 +57,7 @@ BOOLEAN XboxDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); ULONG XboxDiskGetCacheableBlockCount(ULONG DriveNumber); -VOID XboxRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); +TIMEINFO* XboxGetTime(VOID); PCONFIGURATION_COMPONENT_DATA XboxHwDetect(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -72,7 +72,8 @@ BOOLEAN (*DiskGetDriveGeometry)(ULONG DriveNumber, PGEOMETRY DriveGeometry); ULONG (*DiskGetCacheableBlockCount)(ULONG DriveNumber); - VOID (*RTCGetCurrentDateTime)(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); + TIMEINFO* (*GetTime)(VOID); + ULONG (*GetRelativeTime)(VOID); PCONFIGURATION_COMPONENT_DATA (*HwDetect)(VOID); } MACHVTBL, *PMACHVTBL; @@ -115,7 +116,8 @@ BOOLEAN MachDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN MachDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); ULONG MachDiskGetCacheableBlockCount(ULONG DriveNumber); -VOID MachRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); +TIMEINFO* ArcGetTime(VOID); +ULONG ArcGetRelativeTime(VOID); VOID MachHwDetect(VOID); VOID MachPrepareForReactOS(IN BOOLEAN Setup); @@ -147,7 +149,6 @@ #define MachDiskGetPartitionEntry(Drive, Part, Entry) MachVtbl.DiskGetPartitionEntry((Drive), (Part), (Entry)) #define MachDiskGetDriveGeometry(Drive, Geom) MachVtbl.DiskGetDriveGeometry((Drive), (Geom)) #define MachDiskGetCacheableBlockCount(Drive) MachVtbl.DiskGetCacheableBlockCount(Drive) -#define MachRTCGetCurrentDateTime(Y, Mo, D, H, Mi, S) MachVtbl.RTCGetCurrentDateTime((Y), (Mo), (D), (H), (Mi), (S)); #define MachHwDetect() MachVtbl.HwDetect() #endif /* __MACHINE_H_ */ Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -47,7 +47,6 @@ #undef MachDiskGetPartitionEntry #undef MachDiskGetDriveGeometry #undef MachDiskGetCacheableBlockCount -#undef MachRTCGetCurrentDateTime #undef MachHwDetect MACHVTBL MachVtbl; @@ -228,10 +227,24 @@ return MachVtbl.DiskGetCacheableBlockCount(DriveNumber); } -VOID -MachRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second) -{ - MachVtbl.RTCGetCurrentDateTime(Year, Month, Day, Hour, Minute, Second); +TIMEINFO* +ArcGetTime(VOID) +{ + return MachVtbl.GetTime(); +} + +ULONG +ArcGetRelativeTime(VOID) +{ + TIMEINFO* TimeInfo; + ULONG ret; + + if (MachVtbl.GetRelativeTime) + return MachVtbl.GetRelativeTime(); + + TimeInfo = ArcGetTime(); + ret = ((TimeInfo->Hour * 24) + TimeInfo->Minute) * 60 + TimeInfo->Second; + return ret; } VOID Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -442,9 +442,8 @@ VOID TuiUpdateDateTime(VOID) { - ULONG Year, Month, Day; - ULONG Hour, Minute, Second; - CHAR DateString[40]; + TIMEINFO* TimeInfo; + char DateString[40]; CHAR TimeString[40]; CHAR TempString[20]; BOOLEAN PMHour = FALSE; @@ -452,27 +451,31 @@ /* Don't draw the time if this has been disabled */ if (!UiDrawTime) return; - MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - if (Year < 1 || 9999 < Year || Month < 1 || 12 < Month || Day < 1 || - 31 < Day || 23 < Hour || 59 < Minute || 59 < Second) + TimeInfo = ArcGetTime(); + if (TimeInfo->Year < 1 || 9999 < TimeInfo->Year || + TimeInfo->Month < 1 || 12 < TimeInfo->Month || + TimeInfo->Day < 1 || 31 < TimeInfo->Day || + 23 < TimeInfo->Hour || + 59 < TimeInfo->Minute || + 59 < TimeInfo->Second) { /* This happens on QEmu sometimes. We just skip updating */ return; } // Get the month name - strcpy(DateString, UiMonthNames[Month - 1]); + strcpy(DateString, UiMonthNames[TimeInfo->Month - 1]); // Get the day - _itoa(Day, TempString, 10); + _itoa(TimeInfo->Day, TempString, 10); // Get the day postfix - if (1 == Day || 21 == Day || 31 == Day) + if (1 == TimeInfo->Day || 21 == TimeInfo->Day || 31 == TimeInfo->Day) { strcat(TempString, "st"); } - else if (2 == Day || 22 == Day) + else if (2 == TimeInfo->Day || 22 == TimeInfo->Day) { strcat(TempString, "nd"); } - else if (3 == Day || 23 == Day) + else if (3 == TimeInfo->Day || 23 == TimeInfo->Day) { strcat(TempString, "rd"); } @@ -486,35 +489,35 @@ strcat(DateString, " "); // Get the year and add it to the date - _itoa(Year, TempString, 10); + _itoa(TimeInfo->Year, TempString, 10); strcat(DateString, TempString); // Draw the date TuiDrawText(UiScreenWidth-strlen(DateString)-2, 1, DateString, ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); // Get the hour and change from 24-hour mode to 12-hour - if (Hour > 12) - { - Hour -= 12; + if (TimeInfo->Hour > 12) + { + TimeInfo->Hour -= 12; PMHour = TRUE; } - if (Hour == 0) - { - Hour = 12; - } - _itoa(Hour, TempString, 10); + if (TimeInfo->Hour == 0) + { + TimeInfo->Hour = 12; + } + _itoa(TimeInfo->Hour, TempString, 10); strcpy(TimeString, " "); strcat(TimeString, TempString); strcat(TimeString, ":"); - _itoa(Minute, TempString, 10); - if (Minute < 10) + _itoa(TimeInfo->Minute, TempString, 10); + if (TimeInfo->Minute < 10) { strcat(TimeString, "0"); } strcat(TimeString, TempString); strcat(TimeString, ":"); - _itoa(Second, TempString, 10); - if (Second < 10) + _itoa(TimeInfo->Second, TempString, 10); + if (TimeInfo->Second < 10) { strcat(TimeString, "0"); } Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -23,6 +23,7 @@ UiMenuKeyPressFilterCallback KeyPressFilter) { UI_MENU_INFO MenuInformation; + ULONG InitialClockSecond; ULONG LastClockSecond; ULONG CurrentClockSecond; ULONG KeyPress; @@ -59,7 +60,7 @@ // // Get the current second of time // - MachRTCGetCurrentDateTime(NULL, NULL, NULL, NULL, NULL, &LastClockSecond); + InitialClockSecond = LastClockSecond = ArcGetRelativeTime(); // // Process keys @@ -87,17 +88,12 @@ // // Check if there is a countdown // - if (MenuInformation.MenuTimeRemaining) - { - // - // Get the updated time, seconds only - // - MachRTCGetCurrentDateTime(NULL, - NULL, - NULL, - NULL, - NULL, - &CurrentClockSecond); + if (MenuInformation.MenuTimeRemaining != -1) + { + // + // Get the updated time + // + CurrentClockSecond = ArcGetRelativeTime(); // // Check if more then a second has now elapsed @@ -108,7 +104,10 @@ // Update the time information // LastClockSecond = CurrentClockSecond; - MenuInformation.MenuTimeRemaining--; + MenuInformation.MenuTimeRemaining = + InitialClockSecond + MenuTimeOut - LastClockSecond; + if (MenuInformation.MenuTimeRemaining < 0) + MenuInformation.MenuTimeRemaining = 0; // // Update the menu @@ -117,7 +116,7 @@ VideoCopyOffScreenBufferToVRAM(); } } - else + else if (MenuInformation.MenuTimeRemaining == 0) { // // A time out occurred, exit this loop and return default OS Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -121,6 +121,16 @@ MemoryMaximum } MEMORY_TYPE; +typedef struct _TIMEINFO +{ + USHORT Year; + USHORT Month; + USHORT Day; + USHORT Hour; + USHORT Minute; + USHORT Second; +} TIMEINFO; + typedef struct _MEMORY_DESCRIPTOR { MEMORY_TYPE MemoryType;

15 years, 9 months

[fireball] 40685: - WINLDR: Fix SystemRoot path when booting in non-setup mode. - WINLDR: Change path buffers to be MAX_PATH sized instead of an arbitrary 512 bytes value.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Apr 24 23:03:10 2009 New Revision: 40685 URL: http://svn.reactos.org/svn/reactos?rev=40685&view=rev Log: - WINLDR: Fix SystemRoot path when booting in non-setup mode. - WINLDR: Change path buffers to be MAX_PATH sized instead of an arbitrary 512 bytes value. Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Fri Apr 24 23:03:10 2009 @@ -431,10 +431,10 @@ LoadAndBootWindows(PCSTR OperatingSystemName, USHORT OperatingSystemVersion) { CHAR MsgBuffer[256]; - CHAR SystemPath[512], SearchPath[512]; - CHAR FileName[512]; - CHAR BootPath[512]; + CHAR FullPath[MAX_PATH], SystemRoot[MAX_PATH], BootPath[MAX_PATH]; + CHAR FileName[MAX_PATH]; CHAR BootOptions[256]; + PCHAR PathSeparator; PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; ULONG SectionId; @@ -463,12 +463,17 @@ UiDrawProgressBarCenter(1, 100, "Loading Windows..."); /* Make sure the system path is set in the .ini file */ - if (!IniReadSettingByName(SectionId, "SystemPath", SystemPath, sizeof(SystemPath))) + if (!IniReadSettingByName(SectionId, "SystemPath", FullPath, sizeof(FullPath))) { UiMessageBox("System path not specified for selected operating system."); return; } + /* Convert FullPath to SystemRoot */ + PathSeparator = strstr(FullPath, "\\"); + strcpy(SystemRoot, PathSeparator); + strcat(SystemRoot, "\\"); + /* Read booting options */ if (!IniReadSettingByName(SectionId, "Options", BootOptions, sizeof(BootOptions))) { @@ -477,23 +482,23 @@ } /* Special case for LiveCD */ - if (!_strnicmp(SystemPath, "LiveCD", strlen("LiveCD"))) - { - strcpy(BootPath, SystemPath + strlen("LiveCD")); - MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); - strcat(SystemPath, BootPath); + if (!_strnicmp(SystemRoot, "LiveCD", strlen("LiveCD"))) + { + strcpy(BootPath, SystemRoot + strlen("LiveCD")); + MachDiskGetBootPath(SystemRoot, sizeof(SystemRoot)); + strcat(SystemRoot, BootPath); } /* Let user know we started loading */ UiDrawStatusText("Loading..."); /* append a backslash */ - strcpy(BootPath, SystemPath); + strcpy(BootPath, FullPath); if ((strlen(BootPath)==0) || BootPath[strlen(BootPath)] != '\\') strcat(BootPath, "\\"); - DPRINTM(DPRINT_WINDOWS,"SystemRoot: '%s'\n", BootPath); + DPRINTM(DPRINT_WINDOWS,"BootPath: '%s'\n", BootPath); /* Allocate and minimalistic-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); @@ -535,12 +540,12 @@ } /* Load all referenced DLLs for kernel, HAL and kdcom.dll */ - strcpy(SearchPath, BootPath); - strcat(SearchPath, "SYSTEM32\\"); - WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE); - WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE); + strcpy(FileName, BootPath); + strcat(FileName, "SYSTEM32\\"); + WinLdrScanImportDescriptorTable(LoaderBlock, FileName, KernelDTE); + WinLdrScanImportDescriptorTable(LoaderBlock, FileName, HalDTE); if (KdComDTE) - WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE); + WinLdrScanImportDescriptorTable(LoaderBlock, FileName, KdComDTE); /* Load Hive, and then NLS data, OEM font, and prepare boot drivers list */ Status = WinLdrLoadAndScanSystemHive(LoaderBlock, BootPath); @@ -554,7 +559,7 @@ WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); /* Initialize Phase 1 - no drivers loading anymore */ - WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemPath, BootPath, OperatingSystemVersion); + WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemRoot, BootPath, OperatingSystemVersion); /* Save entry-point pointer and Loader block VAs */ KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint;

15 years, 9 months

[fireball] 40684: - Reenable partition table exploration, but switch off disk error reporting before doing it.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Apr 24 22:38:10 2009 New Revision: 40684 URL: http://svn.reactos.org/svn/reactos?rev=40684&view=rev Log: - Reenable partition table exploration, but switch off disk error reporting before doing it. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Fri Apr 24 22:38:10 2009 @@ -500,9 +500,7 @@ ULONG Signature; CHAR Identifier[20]; CHAR ArcName[256]; -#if 0 PARTITION_TABLE_ENTRY PartitionTableEntry; -#endif /* Read the MBR */ if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER)) @@ -538,9 +536,9 @@ sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)partition(0)", DriveNumber - 0x80); FsRegisterDevice(ArcName, &DiskVtbl); -#if 0 /* Add partitions */ i = 0; + DiskReportError(FALSE); while (MachDiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) { if (PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) @@ -550,7 +548,7 @@ } i++; } -#endif + DiskReportError(TRUE); /* Convert checksum and signature to identifier string */ Identifier[0] = Hex[(Checksum >> 28) & 0x0F];

15 years, 9 months

[fireball] 40683: - WINLDR: Pass boot options to the kernel when booting in setup mode (it was disabled for debugging reasons).

by fireball＠svn.reactos.org

Author: fireball Date: Fri Apr 24 22:27:34 2009 New Revision: 40683 URL: http://svn.reactos.org/svn/reactos?rev=40683&view=rev Log: - WINLDR: Pass boot options to the kernel when booting in setup mode (it was disabled for debugging reasons). Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Fri Apr 24 22:27:34 2009 @@ -157,7 +157,6 @@ CHAR SystemPath[512], SearchPath[512]; CHAR FileName[512]; CHAR BootPath[512]; - CHAR LoadOptions[512]; LPCSTR BootOptions; PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; @@ -234,7 +233,7 @@ /* Construct the system path */ sprintf(SystemPath, "%s\\", SourcePath); - DPRINTM(DPRINT_WINDOWS,"SystemRoot: '%s', SystemPath: '%s'\n", BootPath, SystemPath); + DPRINTM(DPRINT_WINDOWS,"BootPath: '%s', SystemPath: '%s'\n", BootPath, SystemPath); /* Allocate and minimalistic-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); @@ -298,8 +297,7 @@ WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); /* Initialize Phase 1 - no drivers loading anymore */ - LoadOptions[0] = 0; - WinLdrInitializePhase1(LoaderBlock, LoadOptions, SystemPath, BootPath, _WIN32_WINNT_WS03); + WinLdrInitializePhase1(LoaderBlock, (PCHAR)BootOptions, SystemPath, BootPath, _WIN32_WINNT_WS03); /* Save entry-point pointer and Loader block VAs */ KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint;

15 years, 9 months

[fireball] 40682: - WINLDR: Use SystemRoot path as it is because after recent Herve's changes there is no need to do additional operations with it.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Apr 24 22:17:22 2009 New Revision: 40682 URL: http://svn.reactos.org/svn/reactos?rev=40682&view=rev Log: - WINLDR: Use SystemRoot path as it is because after recent Herve's changes there is no need to do additional operations with it. Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Fri Apr 24 22:17:22 2009 @@ -75,7 +75,7 @@ VOID WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, PCHAR Options, - PCHAR SystemPath, + PCHAR SystemRoot, PCHAR BootPath, USHORT VersionToBoot) { @@ -86,7 +86,6 @@ //CHAR ArcBoot[] = "multi(0)disk(0)rdisk(0)partition(1)"; CHAR HalPath[] = "\\"; - CHAR SystemRoot[256]; CHAR ArcBoot[256]; CHAR MiscFiles[256]; ULONG i, PathSeparator; @@ -95,11 +94,9 @@ LoaderBlock->u.I386.CommonDataArea = NULL; // Force No ABIOS support /* Construct SystemRoot and ArcBoot from SystemPath */ - PathSeparator = strstr(SystemPath, "\\") - SystemPath; - strncpy(ArcBoot, SystemPath, PathSeparator); + PathSeparator = strstr(BootPath, "\\") - BootPath; + strncpy(ArcBoot, BootPath, PathSeparator); ArcBoot[PathSeparator] = 0; - strcpy(SystemRoot, &SystemPath[PathSeparator]); - strcat(SystemRoot, "\\"); DPRINTM(DPRINT_WINDOWS, "ArcBoot: %s\n", ArcBoot); DPRINTM(DPRINT_WINDOWS, "SystemRoot: %s\n", SystemRoot);

15 years, 9 months

[cfinck] 40681: Fix SeaMonkey link

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Apr 24 18:58:23 2009 New Revision: 40681 URL: http://svn.reactos.org/svn/reactos?rev=40681&view=rev Log: Fix SeaMonkey link Modified: trunk/reactos/base/applications/downloader/downloader.xml Modified: trunk/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/reactos/base/applications/downloader/downloader.xml [iso-8859-1] Fri Apr 24 18:58:23 2009 @@ -32,7 +32,7 @@ <regname>SeaMonkey (1.1.16)</regname> <version>1.1.16</version> <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.</description> - <location> http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.16/seamonkey-1.1.16.en-…</location> + <location>http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.16/seamonkey-1.1.16.en-…</location> </application> <application name="Off By One Browser"> <regname>The Off By One Web Browser</regname>

15 years, 9 months

[cfinck] 40680: Remove Firefox 1.5 from the list, we don't need three versions of it

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Apr 24 18:37:05 2009 New Revision: 40680 URL: http://svn.reactos.org/svn/reactos?rev=40680&view=rev Log: Remove Firefox 1.5 from the list, we don't need three versions of it Modified: trunk/reactos/base/applications/downloader/downloader.xml Modified: trunk/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/reactos/base/applications/downloader/downloader.xml [iso-8859-1] Fri Apr 24 18:37:05 2009 @@ -1,12 +1,5 @@ <tree Version="1">  <category name="Internet & Network" icon="1"> - <application name="Firefox 1.5"> - <regname>Mozilla Firefox (1.5)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>1.5.0.12</version> - <description>The most popular and one of the best free Web Browsers out there.</description> - <location>http://svn.reactos.org/packages/Firefox%20Setup%201.5.0.12.exe</location> - </application> <application name="Firefox 2.0"> <regname>Mozilla Firefox (2.0.0.20)</regname> <licence>MPL/GPL/LGPL</licence>

15 years, 9 months

[cfinck] 40679: - Update SeaMonkey to 1.1.16 - Add Firefox 3.0.9 - Remove Mozilla ActiveX Control, that version isn't compatible anymore with our mshtml. Only take the version automatically downloaded from mshtml now. See issue #4411 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Apr 24 18:26:21 2009 New Revision: 40679 URL: http://svn.reactos.org/svn/reactos?rev=40679&view=rev Log: - Update SeaMonkey to 1.1.16 - Add Firefox 3.0.9 - Remove Mozilla ActiveX Control, that version isn't compatible anymore with our mshtml. Only take the version automatically downloaded from mshtml now. See issue #4411 for more details. Modified: trunk/reactos/base/applications/downloader/downloader.xml Modified: trunk/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/reactos/base/applications/downloader/downloader.xml [iso-8859-1] Fri Apr 24 18:26:21 2009 @@ -14,6 +14,13 @@ <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32…</location> </application> + <application name="Firefox 3.0"> + <regname>Mozilla Firefox (3.0.9)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>3.0.9</version> + <description>The most popular and one of the best free Web Browsers out there.</description> + <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/en…</location> + </application> <application name="Opera"> <regname>Opera</regname> <licence>Freeware</licence> @@ -29,16 +36,10 @@ <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w…</location> </application> <application name="SeaMonkey"> - <regname>SeaMonkey (1.1.14)</regname> - <version>1.1.14</version> + <regname>SeaMonkey (1.1.16)</regname> + <version>1.1.16</version> <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.14/seamo…</location> - </application> - <application name="Mozilla ActiveX Control"> - <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname> - <version>1.7.12</version> - <description>Essential Component to get ReactOS Explorer's and other applications' Internet Browsing feature running.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> + <location> http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.16/seamonkey-1.1.16.en-…</location> </application> <application name="Off By One Browser"> <regname>The Off By One Web Browser</regname>

15 years, 9 months

← Newer
1
...
5
6
7
8
9
10
11
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009